patch 8.2.2582: Vim9: screendump test fails on MS-Windows
Problem: Vim9: screendump test fails on MS-Windows.
Solution: Use :function instead of :def.
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 58a72ef..95c6a5b 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -3339,35 +3339,37 @@
set cpo&vim
enddef
-def Test_no_redraw_when_restoring_cpo()
+" Use :function so we can use Check commands
+func Test_no_redraw_when_restoring_cpo()
CheckScreendump
+ CheckFeature timers
- var lines =<< trim END
+ let lines =<< trim END
vim9script
def script#func()
enddef
END
- mkdir('Xdir/autoload', 'p')
- writefile(lines, 'Xdir/autoload/script.vim')
+ call mkdir('Xdir/autoload', 'p')
+ call writefile(lines, 'Xdir/autoload/script.vim')
- lines =<< trim END
+ let lines =<< trim END
vim9script
set cpo+=M
exe 'set rtp^=' .. getcwd() .. '/Xdir'
au CmdlineEnter : ++once timer_start(0, () => script#func())
setline(1, 'some text')
END
- writefile(lines, 'XTest_redraw_cpo')
- var buf = RunVimInTerminal('-S XTest_redraw_cpo', {'rows': 6})
- term_sendkeys(buf, "V:")
- VerifyScreenDump(buf, 'Test_vim9_no_redraw', {})
+ call writefile(lines, 'XTest_redraw_cpo')
+ let buf = RunVimInTerminal('-S XTest_redraw_cpo', {'rows': 6})
+ call term_sendkeys(buf, "V:")
+ call VerifyScreenDump(buf, 'Test_vim9_no_redraw', {})
- # clean up
- term_sendkeys(buf, "\<Esc>u")
- StopVimInTerminal(buf)
- delete('XTest_redraw_cpo')
- delete('Xdir', 'rf')
-enddef
+ " clean up
+ call term_sendkeys(buf, "\<Esc>u")
+ call StopVimInTerminal(buf)
+ call delete('XTest_redraw_cpo')
+ call delete('Xdir', 'rf')
+endfunc
def Test_unset_any_variable()
diff --git a/src/version.c b/src/version.c
index 5ae184e..447b6e6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2582,
+/**/
2581,
/**/
2580,