From f4414a06311267de8940a88fb18a728d2181e8f8 Mon Sep 17 00:00:00 2001
From: Kurtis Rader <krader@skepticism.us>
Date: Sat, 29 Jul 2017 21:50:39 -0700
Subject: [PATCH] implement `complete -k` as a no-op

Fixes #4270
---
 src/builtin_complete.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/builtin_complete.cpp b/src/builtin_complete.cpp
index c05c532fa..8ab13214d 100644
--- a/src/builtin_complete.cpp
+++ b/src/builtin_complete.cpp
@@ -129,7 +129,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
     wcstring_list_t path;
     wcstring_list_t wrap_targets;
 
-    static const wchar_t *short_options = L":a:c:p:s:l:o:d:frxeuAn:C::w:h";
+    static const wchar_t *short_options = L":a:c:kp:s:l:o:d:frxeuAn:C::w:h";
     static const struct woption long_options[] = {{L"exclusive", no_argument, NULL, 'x'},
                                                   {L"no-files", no_argument, NULL, 'f'},
                                                   {L"require-parameter", no_argument, NULL, 'r'},
@@ -147,6 +147,7 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                                                   {L"wraps", required_argument, NULL, 'w'},
                                                   {L"do-complete", optional_argument, NULL, 'C'},
                                                   {L"help", no_argument, NULL, 'h'},
+                                                  {L"keep-order", no_argument, NULL, 'k'},
                                                   {NULL, 0, NULL, 0}};
 
     int opt;
@@ -165,6 +166,11 @@ int builtin_complete(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
                 result_mode |= NO_COMMON;
                 break;
             }
+            case 'k': {
+                // This is a no-op in fish 2.7. It is implemented in fish 3.0. We want it to be
+                // silently ignored if someone happens to use a completion that uses this flag.
+                break;
+            }
             case 'p':
             case 'c': {
                 wcstring tmp;