Merge pull request #4250 from jbradaric/vim-7.4.895

vim-patch:7.4.895

src/nvim/ex_docmd.c

@@ -2679,16 +2679,25 @@ set_one_cmd_context (
     p = cmd + 1;
   } else {
     p = cmd;
-    while (ASCII_ISALPHA(*p) || *p == '*')        /* Allow * wild card */
+    while (ASCII_ISALPHA(*p) || *p == '*') {  // Allow * wild card
-      ++p;
+      p++;
-    /* check for non-alpha command */
+    }
-    if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL)
+    // a user command may contain digits
-      ++p;
+    if (ASCII_ISUPPER(cmd[0])) {
-    /* for python 3.x: ":py3*" commands completion */
+      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') {
-      ++p;
+      p++;
-      while (ASCII_ISALPHA(*p) || *p == '*')
+      while (ASCII_ISALPHA(*p) || *p == '*') {
-        ++p;
+        p++;
+      }
+    }
+    // check for non-alpha command
+    if (p == cmd && vim_strchr((char_u *)"@*!=><&~#", *p) != NULL) {
+      p++;
     }
     len = (int)(p - cmd);
 
@@ -2702,9 +2711,11 @@ set_one_cmd_context (
               (size_t)len) == 0)
         break;
 
-    if (cmd[0] >= 'A' && cmd[0] <= 'Z')
+    if (cmd[0] >= 'A' && cmd[0] <= 'Z') {
-      while (ASCII_ISALNUM(*p) || *p == '*')            /* Allow * wild card */
+      while (ASCII_ISALNUM(*p) || *p == '*') {  // Allow * wild card
-        ++p;
+        p++;
+      }
+    }
   }
 
   /*

src/nvim/version.c

@@ -395,7 +395,7 @@ static int included_patches[] = {
   898,
   // 897 NA
   // 896,
-  // 895,
+  895,
   // 894 NA
   // 893,
   // 892,