summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-27 23:37:09 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-27 23:37:09 +0200
commit5163fcce792c9d730bf864f4d9bb07f30625cff9 (patch)
treed72ae10b10c3dcb8df67de8ee2238e9d7c8185e5
parent749639ec7248740cd271f34ec5f7bb70891b459c (diff)
patch 8.2.1530: Vim9: test fails on MS-Windowsv8.2.1530
Problem: Vim9: test fails on MS-Windows. Solution: Skip Ex command inside "if false".
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c14
2 files changed, 13 insertions, 3 deletions
diff --git a/src/version.c b/src/version.c
index fcc8a46236..76241f0ec6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1530,
+/**/
1529,
/**/
1528,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 11a75c12c2..c9805f65a1 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: