mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
patch 8.2.1927: Vim9: get unknown error with an error in a timer function
Problem: Vim9: get unknown error with an error in a timer function. Solution: Use did_emsg instead of called_emsg. (closes #7231)
This commit is contained in:
@@ -828,7 +828,7 @@ call_def_function(
|
||||
int defcount = ufunc->uf_args.ga_len - argc;
|
||||
sctx_T save_current_sctx = current_sctx;
|
||||
int breakcheck_count = 0;
|
||||
int called_emsg_before = called_emsg;
|
||||
int did_emsg_before = did_emsg;
|
||||
int save_suppress_errthrow = suppress_errthrow;
|
||||
msglist_T **saved_msg_list = NULL;
|
||||
msglist_T *private_msg_list = NULL;
|
||||
@@ -853,7 +853,7 @@ call_def_function(
|
||||
|| (ufunc->uf_def_status == UF_TO_BE_COMPILED
|
||||
&& compile_def_function(ufunc, FALSE, NULL) == FAIL))
|
||||
{
|
||||
if (called_emsg == called_emsg_before)
|
||||
if (did_emsg == did_emsg_before)
|
||||
semsg(_(e_function_is_not_compiled_str),
|
||||
printable_func_name(ufunc));
|
||||
return FAIL;
|
||||
@@ -2924,7 +2924,7 @@ failed_early:
|
||||
// Not sure if this is necessary.
|
||||
suppress_errthrow = save_suppress_errthrow;
|
||||
|
||||
if (ret != OK && called_emsg == called_emsg_before)
|
||||
if (ret != OK && did_emsg == did_emsg_before)
|
||||
semsg(_(e_unknown_error_while_executing_str),
|
||||
printable_func_name(ufunc));
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user