# HG changeset patch # User Bram Moolenaar # Date 1663708504 -7200 # Node ID 25e3121ed316bd06e49dfc6c39c94aa901b20cdc # Parent 403d8362f8d15669728dcebf7d38d042ee9965fb patch 9.0.0525: manually deleting temp test files Commit: https://github.com/vim/vim/commit/5917341f65d4fc669b9d15343ccdb00c160201da Author: Bram Moolenaar Date: Tue Sep 20 22:01:33 2022 +0100 patch 9.0.0525: manually deleting temp test files Problem: Manually deleting temp test files. Solution: Add the 'D' flag to writefile(). diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim --- a/src/testdir/test_debugger.vim +++ b/src/testdir/test_debugger.vim @@ -81,10 +81,10 @@ func Test_Debugger() endfor enddef END - call writefile(lines, 'Xtest.vim') + call writefile(lines, 'XtestDebug.vim', 'D') " Start Vim in a terminal - let buf = RunVimInTerminal('-S Xtest.vim', {}) + let buf = RunVimInTerminal('-S XtestDebug.vim', {}) " Start the Vim debugger call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()']) @@ -343,19 +343,18 @@ func Test_Debugger_breakadd() let var3 = 30 let var4 = 40 END - call writefile(lines, 'Xtest.vim') + call writefile(lines, 'XdebugBreakadd.vim', 'D') " Start Vim in a terminal - let buf = RunVimInTerminal('Xtest.vim', {}) - call RunDbgCmd(buf, ':breakadd file 2 Xtest.vim') + let buf = RunVimInTerminal('XdebugBreakadd.vim', {}) + call RunDbgCmd(buf, ':breakadd file 2 XdebugBreakadd.vim') call RunDbgCmd(buf, ':4 | breakadd here') - call RunDbgCmd(buf, ':source Xtest.vim', ['line 2: let var2 = 20']) + call RunDbgCmd(buf, ':source XdebugBreakadd.vim', ['line 2: let var2 = 20']) call RunDbgCmd(buf, 'cont', ['line 4: let var4 = 40']) call RunDbgCmd(buf, 'cont') call StopVimInTerminal(buf) - call delete('Xtest.vim') %bw! call assert_fails('breakadd here', 'E32:') @@ -369,31 +368,30 @@ func Test_Debugger_breakadd_expr() let lines =<< trim END let g:Xtest_var += 1 END - call writefile(lines, 'Xtest.vim') + call writefile(lines, 'XdebugBreakExpr.vim', 'D') " Start Vim in a terminal - let buf = RunVimInTerminal('Xtest.vim', {}) + let buf = RunVimInTerminal('XdebugBreakExpr.vim', {}) call RunDbgCmd(buf, ':let g:Xtest_var = 10') call RunDbgCmd(buf, ':breakadd expr g:Xtest_var') call RunDbgCmd(buf, ':source %') - let expected =<< eval trim END + let expected =<< trim eval END Oldval = "10" Newval = "11" - {fnamemodify('Xtest.vim', ':p')} + {fnamemodify('XdebugBreakExpr.vim', ':p')} line 1: let g:Xtest_var += 1 END call RunDbgCmd(buf, ':source %', expected) call RunDbgCmd(buf, 'cont') - let expected =<< eval trim END + let expected =<< trim eval END Oldval = "11" Newval = "12" - {fnamemodify('Xtest.vim', ':p')} + {fnamemodify('XdebugBreakExpr.vim', ':p')} line 1: let g:Xtest_var += 1 END call RunDbgCmd(buf, ':source %', expected) call StopVimInTerminal(buf) - call delete('Xtest.vim') endfunc def Test_Debugger_breakadd_vim9_expr() @@ -406,10 +404,10 @@ def Test_Debugger_breakadd_vim9_expr() endfunc breakdel * END - writefile(lines, 'Xtest.vim') + writefile(lines, 'XdebugBreak9expr.vim', 'D') # Start Vim in a terminal - var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0}) + var buf = g:RunVimInTerminal('-S XdebugBreak9expr.vim', {wait_for_ruler: 0}) call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50) # Despite the failure the functions are defined @@ -419,7 +417,6 @@ def Test_Debugger_breakadd_vim9_expr() ['function LaterFunc()', 'endfunction'], {match: 'pattern'}) call g:StopVimInTerminal(buf) - call delete('Xtest.vim') enddef def Test_Debugger_break_at_return() @@ -432,17 +429,16 @@ def Test_Debugger_break_at_return() enddef breakadd func GetNum END - writefile(lines, 'Xtest.vim') + writefile(lines, 'XdebugBreakRet.vim', 'D') # Start Vim in a terminal - var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0}) + var buf = g:RunVimInTerminal('-S XdebugBreakRet.vim', {wait_for_ruler: 0}) call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50) g:RunDbgCmd(buf, ':call GetNum()', ['line 1: return 1 + 2 + 3'], {match: 'pattern'}) call g:StopVimInTerminal(buf) - call delete('Xtest.vim') enddef func Test_Backtrace_Through_Source() @@ -461,7 +457,7 @@ func Test_Backtrace_Through_Source() call CallAFunction() endfunc END - call writefile(file1, 'Xtest1.vim') + call writefile(file1, 'Xtest1.vim', 'D') let file2 =<< trim END func DoAThing() @@ -474,7 +470,7 @@ func Test_Backtrace_Through_Source() call File2Function() END - call writefile(file2, 'Xtest2.vim') + call writefile(file2, 'Xtest2.vim', 'D') let buf = RunVimInTerminal('-S Xtest1.vim', {}) @@ -616,8 +612,6 @@ func Test_Backtrace_Through_Source() \ 'line 1: call DoAThing()']) call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc func Test_Backtrace_Autocmd() @@ -638,7 +632,7 @@ func Test_Backtrace_Autocmd() au User TestGlobalFunction :call GlobalFunction() | echo "Done" END - call writefile(file1, 'Xtest1.vim') + call writefile(file1, 'Xtest1.vim', 'D') let file2 =<< trim END func DoAThing() @@ -651,7 +645,7 @@ func Test_Backtrace_Autocmd() call File2Function() END - call writefile(file2, 'Xtest2.vim') + call writefile(file2, 'Xtest2.vim', 'D') let buf = RunVimInTerminal('-S Xtest1.vim', {}) @@ -871,8 +865,6 @@ func Test_Backtrace_Autocmd() \ 'cmd: echo "Done"']) call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc func Test_Backtrace_CmdLine() @@ -893,7 +885,7 @@ func Test_Backtrace_CmdLine() au User TestGlobalFunction :call GlobalFunction() | echo "Done" END - call writefile(file1, 'Xtest1.vim') + call writefile(file1, 'Xtest1.vim', 'D') let file2 =<< trim END func DoAThing() @@ -906,7 +898,7 @@ func Test_Backtrace_CmdLine() call File2Function() END - call writefile(file2, 'Xtest2.vim') + call writefile(file2, 'Xtest2.vim', 'D') let buf = RunVimInTerminal( \ '-S Xtest1.vim -c "debug call GlobalFunction()"', @@ -932,8 +924,6 @@ func Test_Backtrace_CmdLine() \ 'line 1: call CallAFunction()']) call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc func Test_Backtrace_DefFunction() @@ -958,7 +948,7 @@ func Test_Backtrace_DefFunction() defcompile END - call writefile(file1, 'Xtest1.vim') + call writefile(file1, 'Xtest1.vim', 'D') let file2 =<< trim END vim9script @@ -976,7 +966,7 @@ func Test_Backtrace_DefFunction() defcompile File2Function() END - call writefile(file2, 'Xtest2.vim') + call writefile(file2, 'Xtest2.vim', 'D') let buf = RunVimInTerminal('-S Xtest1.vim', {}) @@ -1027,8 +1017,6 @@ func Test_Backtrace_DefFunction() \ #{match: 'pattern'}) call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc func Test_DefFunction_expr() @@ -1042,14 +1030,13 @@ func Test_DefFunction_expr() enddef defcompile END - call writefile(file3, 'Xtest3.vim') + call writefile(file3, 'Xtest3.vim', 'D') let buf = RunVimInTerminal('-S Xtest3.vim', {}) call RunDbgCmd(buf, ':breakadd expr g:someVar') call RunDbgCmd(buf, ':call g:ChangeVar()', ['Oldval = "''foo''"', 'Newval = "''bar''"', 'function ChangeVar', 'line 2: echo "changed"']) call StopVimInTerminal(buf) - call delete('Xtest3.vim') endfunc func Test_debug_def_and_legacy_function() @@ -1078,7 +1065,7 @@ func Test_debug_def_and_legacy_function( breakadd func 2 g:SomeFunc END - call writefile(file, 'XtestDebug.vim') + call writefile(file, 'XtestDebug.vim', 'D') let buf = RunVimInTerminal('-S XtestDebug.vim', {}) @@ -1095,7 +1082,6 @@ func Test_debug_def_and_legacy_function( call RunDbgCmd(buf, 'cont') call StopVimInTerminal(buf) - call delete('XtestDebug.vim') endfunc func Test_debug_def_function() @@ -1151,7 +1137,7 @@ func Test_debug_def_function() | eval 2 + 3 enddef END - call writefile(file, 'Xtest.vim') + call writefile(file, 'Xtest.vim', 'D') let buf = RunVimInTerminal('-S Xtest.vim', {}) @@ -1218,7 +1204,6 @@ func Test_debug_def_function() call RunDbgCmd(buf, 'cont') call StopVimInTerminal(buf) - call delete('Xtest.vim') endfunc func Test_debug_def_function_with_lambda() @@ -1232,7 +1217,7 @@ func Test_debug_def_function_with_lambda enddef breakadd func 2 g:Func END - call writefile(lines, 'XtestLambda.vim') + call writefile(lines, 'XtestLambda.vim', 'D') let buf = RunVimInTerminal('-S XtestLambda.vim', {}) @@ -1245,7 +1230,6 @@ func Test_debug_def_function_with_lambda call RunDbgCmd(buf, 'cont') call StopVimInTerminal(buf) - call delete('XtestLambda.vim') endfunc func Test_debug_backtrace_level() @@ -1263,7 +1247,7 @@ func Test_debug_backtrace_level() call s:File1Func( 'arg1' ) END - call writefile(lines, 'Xtest1.vim') + call writefile(lines, 'Xtest1.vim', 'D') let lines =<< trim END let s:file2_var = 'file2' @@ -1276,7 +1260,7 @@ func Test_debug_backtrace_level() call s:File2Func( 'arg2' ) END - call writefile(lines, 'Xtest2.vim') + call writefile(lines, 'Xtest2.vim', 'D') let file1 = getcwd() .. '/Xtest1.vim' let file2 = getcwd() .. '/Xtest2.vim' @@ -1437,8 +1421,6 @@ func Test_debug_backtrace_level() call RunDbgCmd(buf, 'cont') call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc " Test for setting a breakpoint on a :endif where the :if condition is false diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -874,7 +874,7 @@ func Test_diff_screen() set diffexpr= endfunc END - call writefile(lines, 'XdiffSetup') + call writefile(lines, 'XdiffSetup', 'D') " clean up already existing swap files, just in case call delete('.Xdifile1.swp') @@ -1002,7 +1002,6 @@ func Test_diff_screen() call StopVimInTerminal(buf) call delete('Xdifile1') call delete('Xdifile2') - call delete('XdiffSetup') endfunc func Test_diff_with_scroll_and_change() @@ -1016,7 +1015,7 @@ func Test_diff_with_scroll_and_change() wincmd h exe "normal Gl5\" END - call writefile(lines, 'Xtest_scroll_change') + call writefile(lines, 'Xtest_scroll_change', 'D') let buf = RunVimInTerminal('-S Xtest_scroll_change', {}) call VerifyScreenDump(buf, 'Test_diff_scroll_change_01', {}) @@ -1029,7 +1028,6 @@ func Test_diff_with_scroll_and_change() " clean up call StopVimInTerminal(buf) - call delete('Xtest_scroll_change') endfunc func Test_diff_with_cursorline() @@ -1043,7 +1041,7 @@ func Test_diff_with_cursorline() \ 'call setline(1, ["bee","foo","foo","baz"])', \ 'windo diffthis', \ '2wincmd w', - \ ], 'Xtest_diff_cursorline') + \ ], 'Xtest_diff_cursorline', 'D') let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {}) call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {}) @@ -1054,7 +1052,6 @@ func Test_diff_with_cursorline() " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_cursorline') endfunc func Test_diff_with_cursorline_number() @@ -1071,7 +1068,7 @@ func Test_diff_with_cursorline_number() windo diffthis 1wincmd w END - call writefile(lines, 'Xtest_diff_cursorline_number') + call writefile(lines, 'Xtest_diff_cursorline_number', 'D') let buf = RunVimInTerminal('-S Xtest_diff_cursorline_number', {}) call VerifyScreenDump(buf, 'Test_diff_with_cursorline_number_01', {}) @@ -1080,7 +1077,6 @@ func Test_diff_with_cursorline_number() " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_cursorline_number') endfunc func Test_diff_with_cursorline_breakindent() @@ -1097,7 +1093,7 @@ func Test_diff_with_cursorline_breakinde \ 'exe "norm 20Abee\j20Afoo\j20Afoo\j20Abaz\"', \ 'windo diffthis', \ '2wincmd w', - \ ], 'Xtest_diff_cursorline_breakindent') + \ ], 'Xtest_diff_cursorline_breakindent', 'D') let buf = RunVimInTerminal('-S Xtest_diff_cursorline_breakindent', {}) call term_sendkeys(buf, "gg0") @@ -1111,7 +1107,6 @@ func Test_diff_with_cursorline_breakinde " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_cursorline_breakindent') endfunc func Test_diff_with_syntax() @@ -1124,7 +1119,7 @@ func Test_diff_with_syntax() return 5; } END - call writefile(lines, 'Xprogram1.c') + call writefile(lines, 'Xprogram1.c', 'D') let lines =<< trim END void doSomething() { int x = 0; @@ -1132,22 +1127,19 @@ func Test_diff_with_syntax() return 5; } END - call writefile(lines, 'Xprogram2.c') + call writefile(lines, 'Xprogram2.c', 'D') let lines =<< trim END edit Xprogram1.c diffsplit Xprogram2.c END - call writefile(lines, 'Xtest_diff_syntax') + call writefile(lines, 'Xtest_diff_syntax', 'D') let buf = RunVimInTerminal('-S Xtest_diff_syntax', {}) call VerifyScreenDump(buf, 'Test_diff_syntax_1', {}) " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_syntax') - call delete('Xprogram1.c') - call delete('Xprogram2.c') endfunc func Test_diff_of_diff() @@ -1161,7 +1153,7 @@ func Test_diff_of_diff() \ 'windo diffthis', \ '1wincmd w', \ 'setlocal number', - \ ], 'Xtest_diff_diff') + \ ], 'Xtest_diff_diff', 'D') let buf = RunVimInTerminal('-S Xtest_diff_diff', {}) call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {}) @@ -1171,7 +1163,6 @@ func Test_diff_of_diff() " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_diff') endfunc func CloseoffSetup() @@ -1253,8 +1244,8 @@ func Test_patchexpr() endfunc set patchexpr=TPatch() - call writefile(['input file'], 'Xinput') - call writefile(['diff file'], 'Xdiff') + call writefile(['input file'], 'Xinput', 'D') + call writefile(['diff file'], 'Xdiff', 'D') %bwipe! edit Xinput diffpatch Xdiff @@ -1271,8 +1262,6 @@ func Test_patchexpr() set patchexpr=NewPatchExpr() call assert_equal(expand('') .. 'NewPatchExpr()', &patchexpr) - call delete('Xinput') - call delete('Xdiff') set patchexpr& delfunc TPatch delfunc s:NewPatchExpr @@ -1289,7 +1278,7 @@ func Test_diff_rnu() windo diffthis setlocal number rnu foldcolumn=0 END - call writefile(content, 'Xtest_diff_rnu') + call writefile(content, 'Xtest_diff_rnu', 'D') let buf = RunVimInTerminal('-S Xtest_diff_rnu', {}) call VerifyScreenDump(buf, 'Test_diff_rnu_01', {}) @@ -1301,7 +1290,6 @@ func Test_diff_rnu() " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_rnu') endfunc func Test_diff_multilineconceal() @@ -1349,7 +1337,7 @@ func Test_diff_filler_cursorcolumn() norm! gg0 redraw! END - call writefile(content, 'Xtest_diff_cuc') + call writefile(content, 'Xtest_diff_cuc', 'D') let buf = RunVimInTerminal('-S Xtest_diff_cuc', {}) call VerifyScreenDump(buf, 'Test_diff_cuc_01', {}) @@ -1366,7 +1354,6 @@ func Test_diff_filler_cursorcolumn() " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_cuc') endfunc " Test for adding/removing lines inside diff chunks, between diff chunks @@ -1465,7 +1452,7 @@ func Test_diff_binary() norm! gg0 redraw! END - call writefile(content, 'Xtest_diff_bin') + call writefile(content, 'Xtest_diff_bin', 'D') let buf = RunVimInTerminal('-S Xtest_diff_bin', {}) " Test using internal diff @@ -1486,7 +1473,6 @@ func Test_diff_binary() " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_bin') set diffopt&vim endfunc @@ -1556,7 +1542,7 @@ func Test_diff_scroll() // containing // four lines END - call writefile(left, 'Xleft') + call writefile(left, 'Xleft', 'D') let right =<< trim END line 1 line 2 @@ -1592,7 +1578,7 @@ func Test_diff_scroll() // containing // four lines END - call writefile(right, 'Xright') + call writefile(right, 'Xright', 'D') let buf = RunVimInTerminal('-d Xleft Xright', {'rows': 12}) call term_sendkeys(buf, "\\jjjj") call VerifyScreenDump(buf, 'Test_diff_scroll_1', {}) @@ -1600,8 +1586,6 @@ func Test_diff_scroll() call VerifyScreenDump(buf, 'Test_diff_scroll_2', {}) call StopVimInTerminal(buf) - call delete('Xleft') - call delete('Xright') endfunc " This was trying to update diffs for a buffer being closed diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim --- a/src/testdir/test_digraph.vim +++ b/src/testdir/test_digraph.vim @@ -494,9 +494,8 @@ endfunc func Test_loadkeymap_error() CheckFeature keymap call assert_fails('loadkeymap', 'E105:') - call writefile(['loadkeymap', 'a'], 'Xkeymap') + call writefile(['loadkeymap', 'a'], 'Xkeymap', 'D') call assert_fails('source Xkeymap', 'E791:') - call delete('Xkeymap') endfunc " Test for the characters displayed on the screen when entering a digraph diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim --- a/src/testdir/test_display.vim +++ b/src/testdir/test_display.vim @@ -78,7 +78,7 @@ func Test_scroll_without_region() set t_cs= set laststatus=2 END - call writefile(lines, 'Xtestscroll') + call writefile(lines, 'Xtestscroll', 'D') let buf = RunVimInTerminal('-S Xtestscroll', #{rows: 10}) call VerifyScreenDump(buf, 'Test_scroll_no_region_1', {}) @@ -102,7 +102,6 @@ func Test_scroll_without_region() " clean up call StopVimInTerminal(buf) - call delete('Xtestscroll') endfunc func Test_display_listchars_precedes() @@ -172,14 +171,13 @@ func Test_scroll_CursorLineNr_update() exe ":norm! o\110ia\" END let filename = 'Xdrawscreen' - call writefile(lines, filename) + call writefile(lines, filename, 'D') let buf = RunVimInTerminal('-S '.filename, #{rows: 5, cols: 50}) call term_sendkeys(buf, "k") call VerifyScreenDump(buf, 'Test_winline_rnu', {}) " clean up call StopVimInTerminal(buf) - call delete(filename) endfunc " check a long file name does not result in the hit-enter prompt @@ -187,28 +185,27 @@ func Test_edit_long_file_name() CheckScreendump let longName = 'x'->repeat(min([&columns, 255])) - call writefile([], longName) + call writefile([], longName, 'D') let buf = RunVimInTerminal('-N -u NONE ' .. longName, #{rows: 8}) call VerifyScreenDump(buf, 'Test_long_file_name_1', {}) " clean up call StopVimInTerminal(buf) - call delete(longName) endfunc func Test_unprintable_fileformats() CheckScreendump - call writefile(["unix\r", "two"], 'Xunix.txt') - call writefile(["mac\r", "two"], 'Xmac.txt') + call writefile(["unix\r", "two"], 'Xunix.txt', 'D') + call writefile(["mac\r", "two"], 'Xmac.txt', 'D') let lines =<< trim END edit Xunix.txt split Xmac.txt edit ++ff=mac END let filename = 'Xunprintable' - call writefile(lines, filename) + call writefile(lines, filename, 'D') let buf = RunVimInTerminal('-S '.filename, #{rows: 9, cols: 50}) call VerifyScreenDump(buf, 'Test_display_unprintable_01', {}) call term_sendkeys(buf, "\\\") @@ -216,9 +213,6 @@ func Test_unprintable_fileformats() " clean up call StopVimInTerminal(buf) - call delete('Xunix.txt') - call delete('Xmac.txt') - call delete(filename) endfunc " Test for scrolling that modifies buffer during visual block @@ -233,7 +227,7 @@ func Test_visual_block_scroll() END let filename = 'Xvisualblockmodifiedscroll' - call writefile(lines, filename) + call writefile(lines, filename, 'D') let buf = RunVimInTerminal('-S '.filename, #{rows: 7}) call term_sendkeys(buf, "V\\") @@ -241,7 +235,6 @@ func Test_visual_block_scroll() call VerifyScreenDump(buf, 'Test_display_visual_block_scroll', {}) call StopVimInTerminal(buf) - call delete(filename) endfunc func Test_display_scroll_at_topline() @@ -267,14 +260,13 @@ func Test_display_scroll_update_visual() call sign_place(2, 'bar', 'foo', bufnr(), { 'lnum': 1 }) autocmd CursorMoved * if getcurpos()[1] == 2 | call sign_unplace('bar', { 'id': 1 }) | endif END - call writefile(lines, 'XupdateVisual.vim') + call writefile(lines, 'XupdateVisual.vim', 'D') let buf = RunVimInTerminal('-S XupdateVisual.vim', #{rows: 8, cols: 60}) call term_sendkeys(buf, "VG7kk") call VerifyScreenDump(buf, 'Test_display_scroll_update_visual', {}) call StopVimInTerminal(buf) - call delete('XupdateVisual.vim') endfunc " Test for 'eob' (EndOfBuffer) item in 'fillchars' @@ -373,7 +365,7 @@ func Test_local_fillchars() call setline(1, ['window 4']->repeat(3)) setlocal fillchars=stl:4,stlnc:d,vert:>,eob:o END - call writefile(lines, 'Xdisplayfillchars') + call writefile(lines, 'Xdisplayfillchars', 'D') let buf = RunVimInTerminal('-S Xdisplayfillchars', #{rows: 12}) call VerifyScreenDump(buf, 'Test_display_fillchars_1', {}) @@ -381,7 +373,6 @@ func Test_local_fillchars() call VerifyScreenDump(buf, 'Test_display_fillchars_2', {}) call StopVimInTerminal(buf) - call delete('Xdisplayfillchars') endfunc func Test_display_linebreak_breakat() @@ -409,7 +400,7 @@ func Test_display_lastline() vsplit 100wincmd < END - call writefile(lines, 'XdispLastline') + call writefile(lines, 'XdispLastline', 'D') let buf = RunVimInTerminal('-S XdispLastline', #{rows: 10}) call VerifyScreenDump(buf, 'Test_display_lastline_1', {}) @@ -423,7 +414,6 @@ func Test_display_lastline() call VerifyScreenDump(buf, 'Test_display_lastline_4', {}) call StopVimInTerminal(buf) - call delete('XdispLastline') endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 525, +/**/ 524, /**/ 523,