aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-08 06:04:08 -04:00
Code Activity

patch 8.2.2895: Vim9: random characters appear in some error messages

Browse Source 
Problem:    Vim9: random characters appear in some error messages.
Solution:   Pass the correct pointer. (closes #8277)
This commit is contained in:
mityu
2021-05-28 17:52:40 +02:00
committed by Bram Moolenaar
parent 2c4a1d0a61
commit 4ac198c61c
4 changed files with 63 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/eval.c
View File

@@ -2358,7 +2358,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
++*arg;
if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[1]))
{
error_white_both(p, op_falsy ? 2 : 1);
error_white_both(*arg - (op_falsy ? 1 : 0), op_falsy ? 2 : 1);
clear_tv(rettv);
return FAIL;
}
@@ -2406,7 +2406,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
*/
if (evaluate && vim9script && !IS_WHITE_OR_NUL((*arg)[1]))
{
error_white_both(p, 1);
error_white_both(*arg, 1);
clear_tv(rettv);
evalarg_used->eval_flags = orig_flags;
return FAIL;
@@ -2511,7 +2511,7 @@ eval2(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
*/
if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[2]))
{
error_white_both(p, 2);
error_white_both(*arg, 2);
clear_tv(rettv);
return FAIL;
}
@@ -2637,7 +2637,7 @@ eval3(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
*/
if (evaluate && in_vim9script() && !IS_WHITE_OR_NUL((*arg)[2]))
{
error_white_both(p, 2);
error_white_both(*arg, 2);
clear_tv(rettv);
return FAIL;
}
@@ -2735,10 +2735,13 @@ eval4(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
? 0 : (evalarg->eval_flags & EVAL_EVALUATE);
if (getnext)
{
*arg = eval_next_line(evalarg);
p = *arg;
}
else if (evaluate && vim9script && !VIM_ISWHITE(**arg))
{
error_white_both(p, len);
error_white_both(*arg, len);
clear_tv(rettv);
return FAIL;
}
@@ -2898,7 +2901,7 @@ eval5(char_u **arg, typval_T *rettv, evalarg_T *evalarg)
{
if (evaluate && vim9script && !VIM_ISWHITE(**arg))
{
error_white_both(p, oplen);
error_white_both(*arg, oplen);
clear_tv(rettv);
return FAIL;
}
@@ -3130,7 +3133,7 @@ eval6(
{
if (evaluate && in_vim9script() && !VIM_ISWHITE(**arg))
{
error_white_both(p, 1);
error_white_both(*arg, 1);
clear_tv(rettv);
return FAIL;
}