diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-14 22:53:31 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-14 22:53:31 +0100 |
| commit | 6acc79f5d4b9d5b02f4ab21ec885e68acc13a2e2 (patch) | |
| tree | 3d540583e4689cb895e2b87b08243549fe0b064a | |
| parent | 1be45b2ea76ae2e39817a98a584d4d6cbb983a7b (diff) | |
| download | vim-git-8.1.0749.tar.gz | |
patch 8.1.0749: error message contains garbagev8.1.0749
Problem: Error message contains garbage. (Dominique Pelle)
Solution: Use correct pointer to failed expression.
| -rw-r--r-- | src/eval.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
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 @@ -796,6 +796,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 749, +/**/ 748, /**/ 747, |