aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.1953: Vim9: extra "unknown" error after other error

Browse Source 
Problem:    Vim9: extra "unknown" error after other error.
Solution:   Restore did_emsg count after EXEC instruction. (closes #7254)
            Improve error message from assert_fails()
This commit is contained in:
Bram Moolenaar
2020-11-04 15:07:16 +01:00
parent c7f7f6db3e
commit 631e8f9345
5 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vim9execute.c
View File

@@ -1071,8 +1071,15 @@ call_def_function(
{
// execute Ex command line
case ISN_EXEC:
SOURCING_LNUM = iptr->isn_lnum;
do_cmdline_cmd(iptr->isn_arg.string);
{
int save_did_emsg = did_emsg;
SOURCING_LNUM = iptr->isn_lnum;
do_cmdline_cmd(iptr->isn_arg.string);
// do_cmdline_cmd() will reset did_emsg, but we want to
// keep track of the count to compare with did_emsg_before.
did_emsg += save_did_emsg;
}
break;
// execute Ex command from pieces on the stack