Mercurial > vim

diff src/vim9compile.c @ 21689:10866fd07595 v8.2.1394

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1394: Vim9: compiling a function interferes with command modifiers Commit: https://github.com/vim/vim/commit/2dd0a2c39a3b3fbffc94d0676e472c78d02ebdbd Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 8 15:10:27 2020 +0200 patch 8.2.1394: Vim9: compiling a function interferes with command modifiers Problem: Vim9: compiling a function interferes with command modifiers. Solution: Save and restore command modifiers. (closes https://github.com/vim/vim/issues/6658)
author Bram Moolenaar <Bram@vim.org>
date Sat, 08 Aug 2020 15:15:04 +0200
parents bb4f55d20951
children f41c646cb8b9
line wrap: on
line diff
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -2668,7 +2668,7 @@ next_line_from_context(cctx_T *cctx, int
 	cctx->ctx_line_start = line;
 	SOURCING_LNUM = cctx->ctx_lnum + 1;
     } while (line == NULL || *skipwhite(line) == NUL
-			  || (skip_comment && vim9_comment_start(skipwhite(line))));
+		     || (skip_comment && vim9_comment_start(skipwhite(line))));
     return line;
 }
 
@@ -7194,10 +7194,11 @@ compile_def_function(ufunc_T *ufunc, int
      */
     for (;;)
     {
-	exarg_T	ea;
-	int	starts_with_colon = FALSE;
-	char_u	*cmd;
-	int	save_msg_scroll = msg_scroll;
+	exarg_T	    ea;
+	cmdmod_T    save_cmdmod;
+	int	    starts_with_colon = FALSE;
+	char_u	    *cmd;
+	int	    save_msg_scroll = msg_scroll;
 
 	// Bail out on the first error to avoid a flood of errors and report
 	// the right line number when inside try/catch.
@@ -7278,6 +7279,7 @@ compile_def_function(ufunc_T *ufunc, int
 	/*
 	 * COMMAND MODIFIERS
 	 */
+	save_cmdmod = cmdmod;
 	if (parse_command_modifiers(&ea, &errormsg, FALSE) == FAIL)
 	{
 	    if (errormsg != NULL)
@@ -7288,7 +7290,7 @@ compile_def_function(ufunc_T *ufunc, int
 	}
 	// TODO: use modifiers in the command
 	undo_cmdmod(&ea, save_msg_scroll);
-	CLEAR_FIELD(cmdmod);
+	cmdmod = save_cmdmod;
 
 	// Skip ":call" to get to the function name.
 	if (checkforcmd(&ea.cmd, "call", 3))