]> granicus.if.org Git - vim/commitdiff
patch 8.2.1530: Vim9: test fails on MS-Windows v8.2.1530
authorBram Moolenaar <Bram@vim.org>
Thu, 27 Aug 2020 21:37:09 +0000 (23:37 +0200)
committerBram Moolenaar <Bram@vim.org>
Thu, 27 Aug 2020 21:37:09 +0000 (23:37 +0200)
Problem:    Vim9: test fails on MS-Windows.
Solution:   Skip Ex command inside "if false".

src/version.c
src/vim9compile.c

index fcc8a462369e1053ce979f08c43a2434bce2cc46..76241f0ec6f04280561342f3402ac6c048cc3271 100644 (file)
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1530,
 /**/
     1529,
 /**/
index 11a75c12c2805527d80a4f735d446fef576c3862..c9805f65a1f7f2d8c1a539d6ec8bd1075cc72c24 100644 (file)
@@ -6879,9 +6879,17 @@ compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx)
                    break;
 
            default:
-                   // Not recognized, execute with do_cmdline_cmd().
-                   ea.arg = p;
-                   line = compile_exec(line, &ea, &cctx);
+                   if (cctx.ctx_skip == SKIP_YES)
+                   {
+                       // We don't check for a next command here.
+                       line = (char_u *)"";
+                   }
+                   else
+                   {
+                       // Not recognized, execute with do_cmdline_cmd().
+                       ea.arg = p;
+                       line = compile_exec(line, &ea, &cctx);
+                   }
                    break;
        }
 nextline: