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 4f931a271485e08e55e588c36ca3381719ac7618..00549365ecde390ab74402d182380a27066e0ae0 100644 (file)
--- 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 e01d1c797076cb40ff30cdc2477392e454139d84..c0a91d39340fda1df165631101c9936a216b090f 100644 (file)
--- 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,
 /**/