# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1647895503 -3600
# Node ID 6e431b1c51d5a21ab1504de14a1b8c727d9e535d
# Parent  acfb2cedbe8d5ae8fab7afb4b4e9ff64496c5617
patch 8.2.4606: test fails because of changed error message

Commit: https://github.com/vim/vim/commit/e18acb02bb58b2e07f3a52ce619752ba39c05ea2
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Mar 21 20:40:35 2022 +0000

    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

diff --git a/src/clientserver.c b/src/clientserver.c
--- a/src/clientserver.c
+++ b/src/clientserver.c
@@ -794,6 +794,7 @@ f_remote_expr(typval_T *argvars UNUSED, 
     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, 
 		    && 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, 
     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
--- 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
--- 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,