mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
patch 8.1.0551: expression evaluation may repeat an error message
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:
@@ -8115,7 +8115,7 @@ ex_execute(exarg_T *eap)
|
||||
char_u *p;
|
||||
garray_T ga;
|
||||
int len;
|
||||
int save_did_emsg;
|
||||
int save_did_emsg = did_emsg;
|
||||
|
||||
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
|
||||
* exception.
|
||||
*/
|
||||
if (!aborting())
|
||||
if (!aborting() && did_emsg == save_did_emsg)
|
||||
EMSG2(_(e_invexpr2), p);
|
||||
ret = FAIL;
|
||||
break;
|
||||
|
@@ -792,6 +792,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
551,
|
||||
/**/
|
||||
550,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user