diff options
| -rw-r--r-- | src/clientserver.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_vim9_import.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/clientserver.c b/src/clientserver.c index caa6fdc668..15e490fd50 100644 --- a/src/clientserver.c +++ b/src/clientserver.c @@ -794,6 +794,7 @@ f_remote_expr(typval_T *argvars UNUSED, typval_T *rettv) rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; +#ifdef FEAT_CLIENTSERVER if (in_vim9script() && (check_for_string_arg(argvars, 0) == 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))) return; -#ifdef FEAT_CLIENTSERVER remote_common(argvars, rettv, TRUE); #endif } @@ -945,13 +945,13 @@ f_remote_send(typval_T *argvars UNUSED, typval_T *rettv) rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; +#ifdef FEAT_CLIENTSERVER if (in_vim9script() && (check_for_string_arg(argvars, 0) == FAIL || check_for_string_arg(argvars, 1) == FAIL || check_for_opt_string_arg(argvars, 2) == FAIL)) return; -#ifdef FEAT_CLIENTSERVER remote_common(argvars, rettv, FALSE); #endif } diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim index c9ae612ca0..2ce825f2ba 100644 --- a/src/testdir/test_vim9_import.vim +++ b/src/testdir/test_vim9_import.vim @@ -2156,7 +2156,7 @@ def Test_vim9script_autoload_duplicate() export var Func = 'asdf' END 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 vim9script @@ -2189,7 +2189,7 @@ def Test_vim9script_autoload_duplicate() var Func = 'asdf' END 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') enddef diff --git a/src/version.c b/src/version.c index f5d7b32800..6d5e1a685c 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,10 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4606, +/**/ + 4605, +/**/ 4604, /**/ 4603, |