patch 8.2.1873: Vim9: missing white space when using <f-args>

Problem:    Vim9: missing white space when using <f-args>.
Solution:   Add spaces. (Christian J. Robinson)

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 599c287e238e39aaa31ba1a413cc632d0ecdac9c..ad3454d8319bf30d3f9ea022523b0c00d10c968d 100644 (file)
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -375,6 +375,24 @@ def Test_command_star_range()
   bwipe!
 enddef
 
+def Test_f_args()
+  var lines =<< trim END
+    vim9script
+
+    func SaveCmdArgs(...)
+      let g:args = a:000
+    endfunc
+
+    command -nargs=* TestFArgs call SaveCmdArgs(<f-args>)
+
+    TestFArgs
+    assert_equal([], g:args)
+
+    TestFArgs one two three
+    assert_equal(['one', 'two', 'three'], g:args)
+  END
+  CheckScriptSuccess(lines)
+enddef
 
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

diff --git a/src/usercmd.c b/src/usercmd.c
index de49d4199c76138d035949c4f8cdc2f860fdb9f3..261a629209a9ee7b2ab07dc0aa29e9e0a465671a 100644 (file)
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -1153,7 +1153,7 @@ uc_split_args(char_u *arg, size_t *lenp)
            p = skipwhite(p);
            if (*p == NUL)
                break;
-           len += 3; // ","
+           len += 4; // ", "
        }
        else
        {
@@ -1199,6 +1199,7 @@ uc_split_args(char_u *arg, size_t *lenp)
                break;
            *q++ = '"';
            *q++ = ',';
+           *q++ = ' ';
            *q++ = '"';
        }
        else

diff --git a/src/version.c b/src/version.c
index dd3435666acf2ec10bc2c4fd1966a35ba1889810..08da9925c2ff818d039484dad9d0a4dc334d8b97 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1873,
 /**/
     1872,
 /**/