patch 7.4.895

Problem:    Custom command line completion does not work for a command
            containing digits.
Solution:   Skip over the digits. (suggested by Yasuhiro Matsumoto)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index c3a01df9fb8b8fbf72fb8728e3e170c9c6e3210b..23514fb124c65e144b1018c951be22dbd68774d5 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -3517,9 +3517,10 @@ set_one_cmd_context(xp, buff)
        p = cmd;
        while (ASCII_ISALPHA(*p) || *p == '*')    /* Allow * wild card */
            ++p;
-       /* check for non-alpha command */
-       if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL)
-           ++p;
+       /* a user command may contain digits */
+       if (ASCII_ISUPPER(cmd[0]))
+           while (ASCII_ISALNUM(*p) || *p == '*')
+               ++p;
        /* for python 3.x: ":py3*" commands completion */
        if (cmd[0] == 'p' && cmd[1] == 'y' && p == cmd + 2 && *p == '3')
        {
@@ -3527,6 +3528,9 @@ set_one_cmd_context(xp, buff)
            while (ASCII_ISALPHA(*p) || *p == '*')
                ++p;
        }
+       /* check for non-alpha command */
+       if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL)
+           ++p;
        len = (int)(p - cmd);
 
        if (len == 0)

diff --git a/src/version.c b/src/version.c
index ee4908109040525e84d7a1fe241126d338130231..746b62959b9c670824169d983a5839ed884eadb4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    895,
 /**/
     894,
 /**/