aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.0749: error message contains garbage

Browse Source 
Problem:    Error message contains garbage. (Dominique Pelle)
Solution:   Use correct pointer to failed expression.
This commit is contained in:
Bram Moolenaar
2019-01-14 22:53:31 +01:00
parent 1be45b2ea7
commit 6acc79f5d4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/eval.c
View File

@@ -702,6 +702,7 @@ eval_to_bool(
static int static int
eval1_emsg(char_u **arg, typval_T *rettv, int evaluate) eval1_emsg(char_u **arg, typval_T *rettv, int evaluate)
{ {
char_u *start = *arg;
int ret; int ret;
int did_emsg_before = did_emsg; int did_emsg_before = did_emsg;
int called_emsg_before = called_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(). // Also check called_emsg for when using assert_fails().
if (!aborting() && did_emsg == did_emsg_before if (!aborting() && did_emsg == did_emsg_before
&& called_emsg == called_emsg_before) && called_emsg == called_emsg_before)
semsg(_(e_invexpr2), arg); semsg(_(e_invexpr2), start);
} }
return ret; return ret;
} }

2
src/version.c
View File

@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
749,
/**/ /**/
748, 748,
/**/ /**/