mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 19:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.1100: Vim9: cannot use line break in :execute argument

Browse Source 
Problem:    Vim9: cannot use line break in :execute, :echomsg and :echoerr
            argument.
Solution:   Check for line break.

47e880d6c1

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-04-14 14:18:23 +08:00
parent 78dd6100b1
commit 04b58cec86
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/eval.c
View File

@@ -736,14 +736,17 @@ int eval_to_bool(char *arg, bool *error, exarg_T *eap, int skip)
} }
/// Call eval1() and give an error message if not done at a lower level. /// Call eval1() and give an error message if not done at a lower level.
static int eval1_emsg(char **arg, typval_T *rettv, bool evaluate) static int eval1_emsg(char **arg, typval_T *rettv, exarg_T *eap)
FUNC_ATTR_NONNULL_ARG(1, 2) FUNC_ATTR_NONNULL_ARG(1, 2)
{ {
const char *const start = *arg; const char *const start = *arg;
const int did_emsg_before = did_emsg; const int did_emsg_before = did_emsg;
const int called_emsg_before = called_emsg; const int called_emsg_before = called_emsg;
evalarg_T evalarg;
const int ret = eval1(arg, rettv, evaluate ? &EVALARG_EVALUATE : NULL); fill_evalarg_from_eap(&evalarg, eap, eap != NULL && eap->skip);
const int ret = eval1(arg, rettv, &evalarg);
if (ret == FAIL) { if (ret == FAIL) {
// Report the invalid expression unless the expression evaluation has // Report the invalid expression unless the expression evaluation has
// been cancelled due to an aborting error, an interrupt, or an // been cancelled due to an aborting error, an interrupt, or an
@@ -755,6 +758,7 @@ static int eval1_emsg(char **arg, typval_T *rettv, bool evaluate)
semsg(_(e_invexpr2), start); semsg(_(e_invexpr2), start);
} }
} }
clear_evalarg(&evalarg, eap);
return ret; return ret;
} }
@@ -799,7 +803,7 @@ int eval_expr_typval(const typval_T *expr, typval_T *argv, int argc, typval_T *r
return FAIL; return FAIL;
} }
s = skipwhite(s); s = skipwhite(s);
if (eval1_emsg(&s, rettv, true) == FAIL) { if (eval1_emsg(&s, rettv, NULL) == FAIL) {
return FAIL; return FAIL;
} }
if (*skipwhite(s) != NUL) { // check for trailing chars after expr if (*skipwhite(s) != NUL) { // check for trailing chars after expr
@@ -7573,7 +7577,7 @@ void ex_execute(exarg_T *eap)
emsg_skip++; emsg_skip++;
} }
while (*arg != NUL && *arg != '|' && *arg != '\n') { while (*arg != NUL && *arg != '|' && *arg != '\n') {
ret = eval1_emsg(&arg, &rettv, !eap->skip); ret = eval1_emsg(&arg, &rettv, eap);
if (ret == FAIL) { if (ret == FAIL) {
break; break;
} }