aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.0551: expression evaluation may repeat an error message

Browse Source 
Problem:    Expression evaluation may repeat an error message. (Jason
            Franklin)
Solution:   Check for the value of did_emsg when giving an error
            for the :execute command.
This commit is contained in:
Bram Moolenaar
2018-11-28 21:20:38 +01:00
parent 76a6345433
commit 8ff5af9544
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eval.c
View File

@@ -8115,7 +8115,7 @@ ex_execute(exarg_T *eap)
char_u *p; char_u *p;
garray_T ga; garray_T ga;
int len; int len;
int save_did_emsg; int save_did_emsg = did_emsg;
ga_init2(&ga, 1, 80); ga_init2(&ga, 1, 80);
@@ -8131,7 +8131,7 @@ ex_execute(exarg_T *eap)
* has been cancelled due to an aborting error, an interrupt, or an * has been cancelled due to an aborting error, an interrupt, or an
* exception. * exception.
*/ */
if (!aborting()) if (!aborting() && did_emsg == save_did_emsg)
EMSG2(_(e_invexpr2), p); EMSG2(_(e_invexpr2), p);
ret = FAIL; ret = FAIL;
break; break;

2
src/version.c
View File

@@ -792,6 +792,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 */
/**/
551,
/**/ /**/
550, 550,
/**/ /**/