aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2892: error message contains random characters

Browse Source 
Problem:    Error message contains random characters.
Solution:   Pass the right pointer to error_white_both(). (closes #8272,
            closes #8263)
This commit is contained in:
mityu 2021-05-28 13:50:17 +02:00 committed by Bram Moolenaar
parent 543467136f
commit 89dcb4dce3
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eval.c
View File

@ -2934,7 +2934,7 @@ eval5(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
*/ */
if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[oplen])) if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[oplen]))
{ {
error_white_both(p, oplen); error_white_both(*arg, oplen);
clear_tv(rettv); clear_tv(rettv);
return FAIL; return FAIL;
} }

9
src/testdir/test_vim9_expr.vim
View File

@ -1220,7 +1220,14 @@ def Test_expr5_vim9script()
lines =<< trim END lines =<< trim END
echo 'a'.. 'b' echo 'a'.. 'b'
END END
CheckDefAndScriptFailure(lines, 'E1004:', 1) CheckDefAndScriptFailure(lines, 'E1004: White space required before and after ''..'' at ".. ''b''"', 1)
lines =<< trim END
echo 'a'
..'b'
# comment
END
CheckDefAndScriptFailure(lines, 'E1004: White space required before and after ''..'' at "..''b''"', 2)
# check invalid string concatenation # check invalid string concatenation
lines =<< trim END lines =<< trim END

2
src/version.c
View File

@ -750,6 +750,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 */
/**/
2892,
/**/ /**/
2891, 2891,
/**/ /**/