Mercurial > vim

changeset 30699:f60315945f4a v9.0.0684

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0684: skipped :exe command fails compilation on MS-Windows Commit: https://github.com/vim/vim/commit/2eae3d24d7fe8beed64652bc5c1cbddd09dafc9a Author: Bram Moolenaar <Bram@vim.org> Date: Fri Oct 7 15:09:27 2022 +0100 patch 9.0.0684: skipped :exe command fails compilation on MS-Windows Problem: Skipped :exe command fails compilation on MS-Windows. Solution: Adjust return value when skipping.
author Bram Moolenaar <Bram@vim.org>
date Fri, 07 Oct 2022 16:15:03 +0200
parents 557ad7615a24
children 1e8f19b459dd
files src/version.c src/vim9compile.c src/vim9instr.c
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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);
 		    }
--- a/src/vim9instr.c
+++ b/src/vim9instr.c
@@ -1876,6 +1876,7 @@ generate_MULT_EXPR(cctx_T *cctx, isntype
 {
     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;