thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1919: assert_fails() setting emsg_silent changes normal execution

Browse Source 
Problem:    Assert_fails() setting emsg_silent changes normal execution.
Solution:   Use a separate flag in_assert_fails.
This commit is contained in:
Bram Moolenaar
2020-10-28 20:20:00 +01:00
parent 3e2534ed1a
commit 28ee892ac4
19 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/testing.c
View File

@@ -555,8 +555,7 @@ f_assert_fails(typval_T *argvars, typval_T *rettv)
// trylevel must be zero for a ":throw" command to be considered failed
trylevel = 0;
suppress_errthrow = TRUE;
emsg_silent = TRUE;
emsg_assert_fails_used = TRUE;
in_assert_fails = TRUE;
do_cmdline_cmd(cmd);
if (called_emsg == called_emsg_before)
@@ -679,9 +678,13 @@ f_assert_fails(typval_T *argvars, typval_T *rettv)
theend:
trylevel = save_trylevel;
suppress_errthrow = FALSE;
emsg_silent = FALSE;
in_assert_fails = FALSE;
did_emsg = FALSE;
msg_col = 0;
need_wait_return = FALSE;
emsg_on_display = FALSE;
emsg_assert_fails_used = FALSE;
msg_scrolled = 0;
lines_left = Rows;
VIM_CLEAR(emsg_assert_fails_msg);
set_vim_var_string(VV_ERRMSG, NULL, 0);
if (wrong_arg_msg != NULL)