Mercurial > vim
changeset 28162:6e431b1c51d5 v8.2.4606
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
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 21 Mar 2022 21:45:03 +0100 |
parents | acfb2cedbe8d |
children | 8a6e4f9e45e3 |
files | src/clientserver.c src/testdir/test_vim9_import.vim src/version.c |
diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 }
--- 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