From b3ddc23507c391c776614a8dc8139939c711dee4 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 30 Nov 2020 01:08:27 -0500 Subject: test/old: partial port of patch 8.1.0711 Patch 8.1.0711 is too difficult to merge in 1 commit. --- src/nvim/testdir/test49.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/nvim/testdir/test49.vim') diff --git a/src/nvim/testdir/test49.vim b/src/nvim/testdir/test49.vim index c86fdf25ab..103b282bc7 100644 --- a/src/nvim/testdir/test49.vim +++ b/src/nvim/testdir/test49.vim @@ -318,7 +318,7 @@ let ExtraVimCount = 0 let ExtraVimBase = expand("") let ExtraVimTestEnv = "" " -function! ExtraVim(...) +function ExtraVim(...) " Count how often this function is called. let g:ExtraVimCount = g:ExtraVimCount + 1 @@ -500,7 +500,7 @@ endfunction " an ExtraVim script as passed by ExtraVim() in ExtraVimBegin. " " EXTRA_VIM_START - do not change or remove this line. -function! ExtraVimThrowpoint() +function ExtraVimThrowpoint() if !exists("g:ExtraVimBegin") Xout "ExtraVimThrowpoint() used outside ExtraVim() script." return v:throwpoint @@ -530,7 +530,7 @@ endfunction " as a script file, use ExecAsScript below. " " EXTRA_VIM_START - do not change or remove this line. -function! MakeScript(funcname, ...) +function MakeScript(funcname, ...) let script = tempname() execute "redir! >" . script execute "function" a:funcname @@ -568,7 +568,7 @@ endfunction " location specified in the function. " " EXTRA_VIM_START - do not change or remove this line. -function! ExecAsScript(funcname) +function ExecAsScript(funcname) " Make a script from the function passed as argument. let script = MakeScript(a:funcname) @@ -8548,7 +8548,7 @@ endfunction " Remove the autocommands for the events specified as arguments in all used " autogroups. -function! Delete_autocommands(...) +function Delete_autocommands(...) let augfile = tempname() while 1 try -- cgit From 8562c2cb6bab3128d21224a9bd45832826c700cd Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 30 Nov 2020 01:11:22 -0500 Subject: test/old: partial port of patch 8.1.0736 Required for patch 8.1.2264. --- src/nvim/testdir/test49.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/testdir/test49.vim') diff --git a/src/nvim/testdir/test49.vim b/src/nvim/testdir/test49.vim index 103b282bc7..5468f7c4aa 100644 --- a/src/nvim/testdir/test49.vim +++ b/src/nvim/testdir/test49.vim @@ -3694,7 +3694,7 @@ endif if ExtraVim(msgfile) try Xpath 4194304 " X: 4194304 - let x = novar " error E121/E15; exception: E121 + let x = novar " error E121; exception: E121 catch /E15:/ " should not catch Xpath 8388608 " X: 0 endtry @@ -3702,7 +3702,7 @@ if ExtraVim(msgfile) endif Xpath 33554432 " X: 33554432 -if !MESSAGES('E121', "Undefined variable", 'E15', "Invalid expression") +if !MESSAGES('E121', "Undefined variable") Xpath 67108864 " X: 0 endif -- cgit