vim-patch:7.4.1990

Problem:    Cscope items are not sorted.
Solution:   Put the new "a" command first. (Ken Takata)

80632db65e

All changes applied manually.

src/nvim/if_cscope.c

@@ -52,7 +52,7 @@ static cscmd_T cs_cmds[] =
   { "add",    cs_add,
     N_("Add a new database"),     "add file|dir [pre-path] [flags]", 0 },
   { "find",   cs_find,
-    N_("Query for a pattern"),    "find c|d|e|f|g|i|s|t|a name", 1 },
+    N_("Query for a pattern"),    "find a|c|d|e|f|g|i|s|t name", 1 },
   { "help",   cs_help,
     N_("Show this message"),      "help", 0 },
   { "kill",   cs_kill,
@@ -105,7 +105,7 @@ char_u *get_cscope_name(expand_T *xp, int idx)
   {
     const char *query_type[] =
     {
-      "c", "d", "e", "f", "g", "i", "s", "t", "a", NULL
+      "a", "c", "d", "e", "f", "g", "i", "s", "t", NULL
     };
 
     /* Complete with query type of ":cscope find {query_type}".
@@ -1132,6 +1132,7 @@ static int cs_help(exarg_T *eap)
         cmdp->usage);
     if (strcmp(cmdp->name, "find") == 0)
       MSG_PUTS(_("\n"
+              "       a: Find assignments to this symbol\n"
               "       c: Find functions calling this function\n"
               "       d: Find functions called by this function\n"
               "       e: Find this egrep pattern\n"
@@ -1139,8 +1140,7 @@ static int cs_help(exarg_T *eap)
               "       g: Find this definition\n"
               "       i: Find files #including this file\n"
               "       s: Find this C symbol\n"
-              "       t: Find this text string\n"
-              "       a: Find assignments to this symbol\n"));
+              "       t: Find this text string\n"));
 
     cmdp++;
   }

src/nvim/version.c

@@ -286,7 +286,7 @@ static int included_patches[] = {
   // 1993,
   // 1992,
   // 1991,
-  // 1990,
+  1990,
   // 1989,
   // 1988 NA
   // 1987 NA