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.4606: test fails because of changed error message

Browse Source 
Problem:    Test fails because of changed error message.
Solution:   Update the expected error message
This commit is contained in:
Bram Moolenaar 2022-03-21 20:40:35 +00:00
parent 6d877fe018
commit e18acb02bb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clientserver.c
View File

@ -794,6 +794,7 @@ f_remote_expr(typval_T *argvars UNUSED, typval_T *rettv)
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;
#ifdef FEAT_CLIENTSERVER
if (in_vim9script() if (in_vim9script()
&& (check_for_string_arg(argvars, 0) == FAIL && (check_for_string_arg(argvars, 0) == FAIL
|| check_for_string_arg(argvars, 1) == FAIL || check_for_string_arg(argvars, 1) == FAIL
@ -802,7 +803,6 @@ f_remote_expr(typval_T *argvars UNUSED, typval_T *rettv)
&& check_for_opt_number_arg(argvars, 3) == FAIL))) && check_for_opt_number_arg(argvars, 3) == FAIL)))
return; return;
#ifdef FEAT_CLIENTSERVER
remote_common(argvars, rettv, TRUE); remote_common(argvars, rettv, TRUE);
#endif #endif
} }
@ -945,13 +945,13 @@ f_remote_send(typval_T *argvars UNUSED, typval_T *rettv)
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL; rettv->vval.v_string = NULL;
#ifdef FEAT_CLIENTSERVER
if (in_vim9script() if (in_vim9script()
&& (check_for_string_arg(argvars, 0) == FAIL && (check_for_string_arg(argvars, 0) == FAIL
|| check_for_string_arg(argvars, 1) == FAIL || check_for_string_arg(argvars, 1) == FAIL
|| check_for_opt_string_arg(argvars, 2) == FAIL)) || check_for_opt_string_arg(argvars, 2) == FAIL))
return; return;
#ifdef FEAT_CLIENTSERVER
remote_common(argvars, rettv, FALSE); remote_common(argvars, rettv, FALSE);
#endif #endif
} }

4
src/testdir/test_vim9_import.vim
View File

@ -2156,7 +2156,7 @@ def Test_vim9script_autoload_duplicate()
export var Func = 'asdf' export var Func = 'asdf'
END END
writefile(lines, 'Xdir/autoload/dup3func.vim') writefile(lines, 'Xdir/autoload/dup3func.vim')
assert_fails('source Xdir/autoload/dup3func.vim', 'E1041: Redefining script item Func') assert_fails('source Xdir/autoload/dup3func.vim', 'E1041: Redefining script item: "Func"')
lines =<< trim END lines =<< trim END
vim9script vim9script
@ -2189,7 +2189,7 @@ def Test_vim9script_autoload_duplicate()
var Func = 'asdf' var Func = 'asdf'
END END
writefile(lines, 'Xdir/autoload/dup6func.vim') writefile(lines, 'Xdir/autoload/dup6func.vim')
assert_fails('source Xdir/autoload/dup6func.vim', 'E1041: Redefining script item Func') assert_fails('source Xdir/autoload/dup6func.vim', 'E1041: Redefining script item: "Func"')
delete('Xdir', 'rf') delete('Xdir', 'rf')
enddef enddef

4
src/version.c
View File

@ -750,6 +750,10 @@ 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 */
/**/
4606,
/**/
4605,
/**/ /**/
4604, 4604,
/**/ /**/