patch 8.2.2281: Vim9: compiled "wincmd" cannot be followed by bar

Problem:    Vim9: compiled "wincmd" cannot be followed by bar.
Solution:   Check for bar after "wincmd". (closes #7599)

diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 095158c51754b996844c2a8357172d923ec10ae5..ab311006829eb03c6b043dfc62dbad3f19c01043 100644 (file)
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -868,4 +868,14 @@ def Test_insert_complete()
   bwipe!
 enddef
 
+def Test_wincmd()
+  split
+  var id1 = win_getid()
+  if true
+    try | wincmd w | catch | endtry
+  endif
+  assert_notequal(id1, win_getid())
+  close
+enddef
+
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

diff --git a/src/version.c b/src/version.c
index 4d31dc7f2a2c35b60ef5d4ecbceaa30834c9ab13..b54cf0a39582722acc3f8bc8d25358805cb01b31 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 */
+/**/
+    2281,
 /**/
     2280,
 /**/

diff --git a/src/vim9compile.c b/src/vim9compile.c
index 23da8f2d11cd6b9c1edee0b17bbc19250a14a0e8..2a2b44eac400000b56726fe360d2dc9f52618085 100644 (file)
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7329,6 +7329,20 @@ compile_exec(char_u *line, exarg_T *eap, cctx_T *cctx)
            if (eap->nextcmd != NULL)
                nextcmd = eap->nextcmd;
        }
+       else if (eap->cmdidx == CMD_wincmd)
+       {
+           p = eap->arg;
+           if (*p != NUL)
+               ++p;
+           if (*p == 'g' || *p == Ctrl_G)
+               ++p;
+           p = skipwhite(p);
+           if (*p == '|')
+           {
+               *p = NUL;
+               nextcmd = p + 1;
+           }
+       }
     }
 
     if (eap->cmdidx == CMD_syntax && STRNCMP(eap->arg, "include ", 8) == 0)