From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 14 Jan 2019 21:53:31 +0000 (+0100)
Subject: patch 8.1.0749: error message contains garbage
X-Git-Tag: v8.1.0749
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6acc79f5d4b9d5b02f4ab21ec885e68acc13a2e2;p=vim

patch 8.1.0749: error message contains garbage

Problem:    Error message contains garbage. (Dominique Pelle)
Solution:   Use correct pointer to failed expression.
---

diff --git a/src/eval.c b/src/eval.c
index 4f931a271..00549365e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -702,6 +702,7 @@ eval_to_bool(
     static int
 eval1_emsg(char_u **arg, typval_T *rettv, int evaluate)
 {
+    char_u	*start = *arg;
     int		ret;
     int		did_emsg_before = did_emsg;
     int		called_emsg_before = called_emsg;
@@ -715,7 +716,7 @@ eval1_emsg(char_u **arg, typval_T *rettv, int evaluate)
 	// Also check called_emsg for when using assert_fails().
 	if (!aborting() && did_emsg == did_emsg_before
 					  && called_emsg == called_emsg_before)
-	    semsg(_(e_invexpr2), arg);
+	    semsg(_(e_invexpr2), start);
     }
     return ret;
 }
diff --git a/src/version.c b/src/version.c
index e01d1c797..c0a91d393 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    749,
 /**/
     748,
 /**/