# HG changeset patch # User Bram Moolenaar # Date 1615382103 -3600 # Node ID 7d28bac9892768878666719d1f1c20da379f3749 # Parent b09fb8a0aed6644d8412b8de800806583ac3dc02 patch 8.2.2582: Vim9: screendump test fails on MS-Windows Commit: https://github.com/vim/vim/commit/ffb7dcdb773c250a6acf45d5670a508be9248cb6 Author: Bram Moolenaar Date: Wed Mar 10 14:00:18 2021 +0100 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 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -3339,35 +3339,37 @@ def Test_restoring_cpo() 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 - - var lines =<< trim END + CheckFeature timers + + let lines =<< trim END vim9script def script#func() enddef END - mkdir('Xdir/autoload', 'p') - writefile(lines, 'Xdir/autoload/script.vim') - - lines =<< trim END + call mkdir('Xdir/autoload', 'p') + call writefile(lines, 'Xdir/autoload/script.vim') + + 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', {}) - - # clean up - term_sendkeys(buf, "\u") - StopVimInTerminal(buf) - delete('XTest_redraw_cpo') - delete('Xdir', 'rf') -enddef + 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 + call term_sendkeys(buf, "\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 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2582, +/**/ 2581, /**/ 2580,