aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1855: Vim9: get error message when nothing is wrong

Browse Source 
Problem:    Vim9: get error message when nothing is wrong.
Solution:   Check called_emsg instead of did_emsg. (closes #7143)
This commit is contained in:
Bram Moolenaar 2020-10-16 23:16:47 +02:00
parent 1e021e63c5
commit e13bdec6b9
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/errors.h
View File

@ -85,7 +85,7 @@ EXTERN char e_missing_rcurly[]
INIT(= N_("E1026: Missing }")); INIT(= N_("E1026: Missing }"));
EXTERN char e_missing_return_statement[] EXTERN char e_missing_return_statement[]
INIT(= N_("E1027: Missing return statement")); INIT(= N_("E1027: Missing return statement"));
EXTERN char e_compile_def_function_failed[] EXTERN char e_compiling_def_function_failed[]
INIT(= N_("E1028: Compiling :def function failed")); INIT(= N_("E1028: Compiling :def function failed"));
EXTERN char e_expected_str_but_got_str[] EXTERN char e_expected_str_but_got_str[]
INIT(= N_("E1029: Expected %s but got %s")); INIT(= N_("E1029: Expected %s but got %s"));

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1855,
/**/ /**/
1854, 1854,
/**/ /**/

6
src/vim9compile.c
View File

@ -6642,7 +6642,9 @@ compile_put(char_u *arg, exarg_T *eap, cctx_T *cctx)
else if (eap->regname != NUL) else if (eap->regname != NUL)
++line; ++line;
// TODO: if the range is something like "$" need to evaluate at runtime // "errormsg" will not be set because the range is ADDR_LINES.
// TODO: if the range contains something like "$" or "." need to evaluate
// at runtime
if (parse_cmd_address(eap, &errormsg, FALSE) == FAIL) if (parse_cmd_address(eap, &errormsg, FALSE) == FAIL)
return NULL; return NULL;
if (eap->addr_count == 0) if (eap->addr_count == 0)
@ -7399,7 +7401,7 @@ erret:
if (errormsg != NULL) if (errormsg != NULL)
emsg(errormsg); emsg(errormsg);
else if (called_emsg == called_emsg_before) else if (called_emsg == called_emsg_before)
emsg(_(e_compile_def_function_failed)); emsg(_(e_compiling_def_function_failed));
} }
current_sctx = save_current_sctx; current_sctx = save_current_sctx;

4
src/vim9execute.c
View File

@ -550,7 +550,7 @@ call_bfunc(int func_idx, int argcount, ectx_T *ectx)
{ {
typval_T argvars[MAX_FUNC_ARGS]; typval_T argvars[MAX_FUNC_ARGS];
int idx; int idx;
int did_emsg_before = did_emsg; int called_emsg_before = called_emsg;
ectx_T *prev_ectx = current_ectx; ectx_T *prev_ectx = current_ectx;
if (call_prepare(argcount, argvars, ectx) == FAIL) if (call_prepare(argcount, argvars, ectx) == FAIL)
@ -566,7 +566,7 @@ call_bfunc(int func_idx, int argcount, ectx_T *ectx)
for (idx = 0; idx < argcount; ++idx) for (idx = 0; idx < argcount; ++idx)
clear_tv(&argvars[idx]); clear_tv(&argvars[idx]);
if (did_emsg != did_emsg_before) if (called_emsg != called_emsg_before)
return FAIL; return FAIL;
return OK; return OK;
} }