From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 27 Aug 2020 21:37:09 +0000 (+0200)
Subject: patch 8.2.1530: Vim9: test fails on MS-Windows
X-Git-Tag: v8.2.1530
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5163fcce792c9d730bf864f4d9bb07f30625cff9;p=vim

patch 8.2.1530: Vim9: test fails on MS-Windows

Problem:    Vim9: test fails on MS-Windows.
Solution:   Skip Ex command inside "if false".
---

diff --git a/src/version.c b/src/version.c
index fcc8a4623..76241f0ec 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1530,
 /**/
     1529,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 11a75c12c..c9805f65a 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -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: