patch 7.4.1990

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

diff --git a/src/if_cscope.c b/src/if_cscope.c
index a782f38d549554c431aeac60bdd27f8767f8264d..3f3f0d219a21d35372e7e3f1a55f1f9121ca563e 100644 (file)
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -70,7 +70,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,
@@ -126,7 +126,7 @@ get_cscope_name(expand_T *xp UNUSED, 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}".
@@ -1351,6 +1351,7 @@ cs_help(exarg_T *eap UNUSED)
                                      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"
@@ -1358,8 +1359,7 @@ cs_help(exarg_T *eap UNUSED)
                       "       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++;
     }

diff --git a/src/version.c b/src/version.c
index 7588c9cf1798fc4650e519faa095324c59dcd2d1..f86eccff0884a5cd2088799a09c28c81678e8fba 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1990,
 /**/
     1989,
 /**/