updated for version 7.2-090

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index b060e63ed7ea590efdd252c7896a8f846d73f7b1..b5d76c1e6d5855e5bceec24e3fb7c08af7261894 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -5482,6 +5482,9 @@ invalid_count:
     return OK;
 }
 
+/*
+ * ":command ..."
+ */
     static void
 ex_command(eap)
     exarg_T   *eap;
@@ -5914,6 +5917,7 @@ do_ucmd(eap)
 
     char_u     *start;
     char_u     *end;
+    char_u     *ksp;
     size_t     len, totlen;
 
     size_t     split_len = 0;
@@ -5930,16 +5934,51 @@ do_ucmd(eap)
 
     /*
      * Replace <> in the command by the arguments.
+     * First round: "buf" is NULL, compute length, allocate "buf".
+     * Second round: copy result into "buf".
      */
     buf = NULL;
     for (;;)
     {
-       p = cmd->uc_rep;
-       q = buf;
+       p = cmd->uc_rep;    /* source */
+       q = buf;            /* destinateion */
        totlen = 0;
-       while ((start = vim_strchr(p, '<')) != NULL
-              && (end = vim_strchr(start + 1, '>')) != NULL)
+
+       for (;;)
        {
+           start = vim_strchr(p, '<');
+           if (start != NULL)
+               end = vim_strchr(start + 1, '>');
+           if (buf != NULL)
+           {
+               ksp = vim_strchr(p, K_SPECIAL);
+               if (ksp != NULL && (start == NULL || ksp < start || end == NULL)
+                       && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)
+# ifdef FEAT_GUI
+                           || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI)
+# endif
+                           ))
+               {
+                   /* K_SPECIAL han been put in the buffer as K_SPECIAL
+                    * KS_SPECIAL KE_FILLER, like for mappings, but
+                    * do_cmdline() doesn't handle that, so convert it back.
+                    * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */
+                   len = ksp - p;
+                   if (len > 0)
+                   {
+                       mch_memmove(q, p, len);
+                       q += len;
+                   }
+                   *q++ = ksp[1] == KS_SPECIAL ? K_SPECIAL : CSI;
+                   p = ksp + 3;
+                   continue;
+               }
+           }
+
+           /* break if there no <item> is found */
+           if (start == NULL || end == NULL)
+               break;
+
            /* Include the '>' */
            ++end;
 

diff --git a/src/version.c b/src/version.c
index ff771c97c7f977845f56972146247829b3172fab..e1d674a7993550d06f026ec8f60ee312442079ca 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    90,
 /**/
     89,
 /**/