Skip to content

Commit

Permalink
patch 8.2.2582: Vim9: screendump test fails on MS-Windows
Browse files Browse the repository at this point in the history
Problem:    Vim9: screendump test fails on MS-Windows.
Solution:   Use :function instead of :def.
  • Loading branch information
brammool committed Mar 10, 2021
1 parent 37294bd commit ffb7dcd
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
32 changes: 17 additions & 15 deletions src/testdir/test_vim9_script.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
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()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2582,
/**/
2581,
/**/
Expand Down

0 comments on commit ffb7dcd

Please sign in to comment.