From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 28 Nov 2018 20:20:38 +0000 (+0100)
Subject: patch 8.1.0551: expression evaluation may repeat an error message
X-Git-Tag: v8.1.0551
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ff5af9544a2abc3d344bba017ef96682e098d9d;p=vim

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.
---

diff --git a/src/eval.c b/src/eval.c
index a52567835..7dfb98125 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -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;
diff --git a/src/version.c b/src/version.c
index d8d66f0ef..29f3ec52e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    551,
 /**/
     550,
 /**/