diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-10-07 15:09:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-07 15:09:27 +0100 |
| commit | 2eae3d24d7fe8beed64652bc5c1cbddd09dafc9a (patch) | |
| tree | 1c1189201bed6f74ce02ee2ffdb46d698b405b84 | |
| parent | bdc09a18fca32715687d9911a431da69186528cc (diff) | |
| download | vim-git-2eae3d24d7fe8beed64652bc5c1cbddd09dafc9a.tar.gz | |
patch 9.0.0684: skipped :exe command fails compilation on MS-Windowsv9.0.0684
Problem: Skipped :exe command fails compilation on MS-Windows.
Solution: Adjust return value when skipping.
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 4 | ||||
| -rw-r--r-- | src/vim9instr.c | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c index 8be8b3820..953bb2292 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 684, +/**/ 683, /**/ 682, diff --git a/src/vim9compile.c b/src/vim9compile.c index 38edbab2b..9f36dc951 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -3339,7 +3339,9 @@ compile_def_function( case CMD_echowindow: { long cmd_count = get_cmd_count(line, &ea); - if (cmd_count >= 0) + if (cmd_count < 0) + line = NULL; + else line = compile_mult_expr(p, ea.cmdidx, cmd_count, &cctx); } diff --git a/src/vim9instr.c b/src/vim9instr.c index 4407d5924..9c3b2a911 100644 --- a/src/vim9instr.c +++ b/src/vim9instr.c @@ -1876,6 +1876,7 @@ generate_MULT_EXPR(cctx_T *cctx, isntype_T isn_type, int count) { isn_T *isn; + RETURN_OK_IF_SKIP(cctx); if ((isn = generate_instr_drop(cctx, isn_type, count)) == NULL) return FAIL; isn->isn_arg.number = count; |