commit e18acb02bb58b2e07f3a52ce619752ba39c05ea2
author Bram Moolenaar <Bram@vim.org> Mon Mar 21 20:40:35 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Mon Mar 21 20:40:35 2022 +0000
tree 16643a0c52d6d695791751ecd7e45b23ba479049
parent 6d877fe0181bdaf382bfc87898e1ddf6e3c78e66

patch 8.2.4606: test fails because of changed error message

Problem:    Test fails because of changed error message.
Solution:   Update the expected error message

src/clientserver.c

diff --git a/src/clientserver.c b/src/clientserver.c
index caa6fdc..15e490f 100644
--- a/src/clientserver.c
+++ b/src/clientserver.c
@@ -794,6 +794,7 @@
     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 @@
 		    && check_for_opt_number_arg(argvars, 3) == FAIL)))
 	return;
 
-#ifdef FEAT_CLIENTSERVER
     remote_common(argvars, rettv, TRUE);
 #endif
 }
@@ -945,13 +945,13 @@
     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
 }

src/testdir/test_vim9_import.vim

diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index c9ae612..2ce825f 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -2156,7 +2156,7 @@
      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 @@
      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

src/version.c

diff --git a/src/version.c b/src/version.c
index f5d7b32..6d5e1a6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,10 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4606,
+/**/
+    4605,
+/**/
     4604,
 /**/
     4603,