patch 8.2.1855: Vim9: get error message when nothing is wrong
Problem: Vim9: get error message when nothing is wrong.
Solution: Check called_emsg instead of did_emsg. (closes #7143)
diff --git a/src/errors.h b/src/errors.h
index 7bacbd5..664bcd9 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -85,7 +85,7 @@
INIT(= N_("E1026: Missing }"));
EXTERN char e_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"));
EXTERN char e_expected_str_but_got_str[]
INIT(= N_("E1029: Expected %s but got %s"));
diff --git a/src/version.c b/src/version.c
index 4710689..cc98769 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1855,
+/**/
1854,
/**/
1853,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 7415624..edfa325 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -6642,7 +6642,9 @@
else if (eap->regname != NUL)
++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)
return NULL;
if (eap->addr_count == 0)
@@ -7399,7 +7401,7 @@
if (errormsg != NULL)
emsg(errormsg);
else if (called_emsg == called_emsg_before)
- emsg(_(e_compile_def_function_failed));
+ emsg(_(e_compiling_def_function_failed));
}
current_sctx = save_current_sctx;
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 521f1c9..27e6368 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -550,7 +550,7 @@
{
typval_T argvars[MAX_FUNC_ARGS];
int idx;
- int did_emsg_before = did_emsg;
+ int called_emsg_before = called_emsg;
ectx_T *prev_ectx = current_ectx;
if (call_prepare(argcount, argvars, ectx) == FAIL)
@@ -566,7 +566,7 @@
for (idx = 0; idx < argcount; ++idx)
clear_tv(&argvars[idx]);
- if (did_emsg != did_emsg_before)
+ if (called_emsg != called_emsg_before)
return FAIL;
return OK;
}