To: vim_dev@googlegroups.com Subject: Patch 9.0.0525 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0525 Problem: Manually deleting temp test files. Solution: Add the 'D' flag to writefile(). Files: src/testdir/test_debugger.vim, src/testdir/test_diffmode.vim, src/testdir/test_digraph.vim, src/testdir/test_display.vim *** ../vim-9.0.0524/src/testdir/test_debugger.vim 2022-08-03 16:13:24.179412223 +0100 --- src/testdir/test_debugger.vim 2022-09-20 21:48:33.457941150 +0100 *************** *** 81,90 **** endfor enddef END ! call writefile(lines, 'Xtest.vim') " Start Vim in a terminal ! let buf = RunVimInTerminal('-S Xtest.vim', {}) " Start the Vim debugger call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()']) --- 81,90 ---- endfor enddef END ! call writefile(lines, 'XtestDebug.vim', 'D') " Start Vim in a terminal ! let buf = RunVimInTerminal('-S XtestDebug.vim', {}) " Start the Vim debugger call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()']) *************** *** 343,361 **** let var3 = 30 let var4 = 40 END ! call writefile(lines, 'Xtest.vim') " Start Vim in a terminal ! let buf = RunVimInTerminal('Xtest.vim', {}) ! call RunDbgCmd(buf, ':breakadd file 2 Xtest.vim') call RunDbgCmd(buf, ':4 | breakadd here') ! call RunDbgCmd(buf, ':source Xtest.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:') --- 343,360 ---- let var3 = 30 let var4 = 40 END ! call writefile(lines, 'XdebugBreakadd.vim', 'D') " Start Vim in a terminal ! let buf = RunVimInTerminal('XdebugBreakadd.vim', {}) ! call RunDbgCmd(buf, ':breakadd file 2 XdebugBreakadd.vim') call RunDbgCmd(buf, ':4 | breakadd here') ! 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) %bw! call assert_fails('breakadd here', 'E32:') *************** *** 369,399 **** let lines =<< trim END let g:Xtest_var += 1 END ! call writefile(lines, 'Xtest.vim') " Start Vim in a terminal ! let buf = RunVimInTerminal('Xtest.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 Oldval = "10" Newval = "11" ! {fnamemodify('Xtest.vim', ':p')} line 1: let g:Xtest_var += 1 END call RunDbgCmd(buf, ':source %', expected) call RunDbgCmd(buf, 'cont') ! let expected =<< eval trim END Oldval = "11" Newval = "12" ! {fnamemodify('Xtest.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() --- 368,397 ---- let lines =<< trim END let g:Xtest_var += 1 END ! call writefile(lines, 'XdebugBreakExpr.vim', 'D') " Start Vim in a terminal ! 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 =<< trim eval END Oldval = "10" Newval = "11" ! {fnamemodify('XdebugBreakExpr.vim', ':p')} line 1: let g:Xtest_var += 1 END call RunDbgCmd(buf, ':source %', expected) call RunDbgCmd(buf, 'cont') ! let expected =<< trim eval END Oldval = "11" Newval = "12" ! {fnamemodify('XdebugBreakExpr.vim', ':p')} line 1: let g:Xtest_var += 1 END call RunDbgCmd(buf, ':source %', expected) call StopVimInTerminal(buf) endfunc def Test_Debugger_breakadd_vim9_expr() *************** *** 406,415 **** endfunc breakdel * END ! writefile(lines, 'Xtest.vim') # Start Vim in a terminal ! var buf = g:RunVimInTerminal('-S Xtest.vim', {wait_for_ruler: 0}) call g:TermWait(buf, g:RunningWithValgrind() ? 1000 : 50) # Despite the failure the functions are defined --- 404,413 ---- endfunc breakdel * END ! writefile(lines, 'XdebugBreak9expr.vim', 'D') # Start Vim in a terminal ! 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,425 **** ['function LaterFunc()', 'endfunction'], {match: 'pattern'}) call g:StopVimInTerminal(buf) - call delete('Xtest.vim') enddef def Test_Debugger_break_at_return() --- 417,422 ---- *************** *** 432,448 **** enddef breakadd func GetNum END ! writefile(lines, 'Xtest.vim') # Start Vim in a terminal ! var buf = g:RunVimInTerminal('-S Xtest.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() --- 429,444 ---- enddef breakadd func GetNum END ! writefile(lines, 'XdebugBreakRet.vim', 'D') # Start Vim in a terminal ! 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) enddef func Test_Backtrace_Through_Source() *************** *** 461,467 **** call CallAFunction() endfunc END ! call writefile(file1, 'Xtest1.vim') let file2 =<< trim END func DoAThing() --- 457,463 ---- call CallAFunction() endfunc END ! call writefile(file1, 'Xtest1.vim', 'D') let file2 =<< trim END func DoAThing() *************** *** 474,480 **** call File2Function() END ! call writefile(file2, 'Xtest2.vim') let buf = RunVimInTerminal('-S Xtest1.vim', {}) --- 470,476 ---- call File2Function() END ! call writefile(file2, 'Xtest2.vim', 'D') let buf = RunVimInTerminal('-S Xtest1.vim', {}) *************** *** 616,623 **** \ 'line 1: call DoAThing()']) call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc func Test_Backtrace_Autocmd() --- 612,617 ---- *************** *** 638,644 **** au User TestGlobalFunction :call GlobalFunction() | echo "Done" END ! call writefile(file1, 'Xtest1.vim') let file2 =<< trim END func DoAThing() --- 632,638 ---- au User TestGlobalFunction :call GlobalFunction() | echo "Done" END ! call writefile(file1, 'Xtest1.vim', 'D') let file2 =<< trim END func DoAThing() *************** *** 651,657 **** call File2Function() END ! call writefile(file2, 'Xtest2.vim') let buf = RunVimInTerminal('-S Xtest1.vim', {}) --- 645,651 ---- call File2Function() END ! call writefile(file2, 'Xtest2.vim', 'D') let buf = RunVimInTerminal('-S Xtest1.vim', {}) *************** *** 871,878 **** \ 'cmd: echo "Done"']) call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc func Test_Backtrace_CmdLine() --- 865,870 ---- *************** *** 893,899 **** au User TestGlobalFunction :call GlobalFunction() | echo "Done" END ! call writefile(file1, 'Xtest1.vim') let file2 =<< trim END func DoAThing() --- 885,891 ---- au User TestGlobalFunction :call GlobalFunction() | echo "Done" END ! call writefile(file1, 'Xtest1.vim', 'D') let file2 =<< trim END func DoAThing() *************** *** 906,912 **** call File2Function() END ! call writefile(file2, 'Xtest2.vim') let buf = RunVimInTerminal( \ '-S Xtest1.vim -c "debug call GlobalFunction()"', --- 898,904 ---- call File2Function() END ! call writefile(file2, 'Xtest2.vim', 'D') let buf = RunVimInTerminal( \ '-S Xtest1.vim -c "debug call GlobalFunction()"', *************** *** 932,939 **** \ 'line 1: call CallAFunction()']) call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc func Test_Backtrace_DefFunction() --- 924,929 ---- *************** *** 958,964 **** defcompile END ! call writefile(file1, 'Xtest1.vim') let file2 =<< trim END vim9script --- 948,954 ---- defcompile END ! call writefile(file1, 'Xtest1.vim', 'D') let file2 =<< trim END vim9script *************** *** 976,982 **** defcompile File2Function() END ! call writefile(file2, 'Xtest2.vim') let buf = RunVimInTerminal('-S Xtest1.vim', {}) --- 966,972 ---- defcompile File2Function() END ! call writefile(file2, 'Xtest2.vim', 'D') let buf = RunVimInTerminal('-S Xtest1.vim', {}) *************** *** 1027,1034 **** \ #{match: 'pattern'}) call StopVimInTerminal(buf) - call delete('Xtest1.vim') - call delete('Xtest2.vim') endfunc func Test_DefFunction_expr() --- 1017,1022 ---- *************** *** 1042,1055 **** enddef defcompile END ! call writefile(file3, 'Xtest3.vim') 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() --- 1030,1042 ---- enddef defcompile END ! 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) endfunc func Test_debug_def_and_legacy_function() *************** *** 1078,1084 **** breakadd func 2 g:SomeFunc END ! call writefile(file, 'XtestDebug.vim') let buf = RunVimInTerminal('-S XtestDebug.vim', {}) --- 1065,1071 ---- breakadd func 2 g:SomeFunc END ! call writefile(file, 'XtestDebug.vim', 'D') let buf = RunVimInTerminal('-S XtestDebug.vim', {}) *************** *** 1095,1101 **** call RunDbgCmd(buf, 'cont') call StopVimInTerminal(buf) - call delete('XtestDebug.vim') endfunc func Test_debug_def_function() --- 1082,1087 ---- *************** *** 1151,1157 **** | eval 2 + 3 enddef END ! call writefile(file, 'Xtest.vim') let buf = RunVimInTerminal('-S Xtest.vim', {}) --- 1137,1143 ---- | eval 2 + 3 enddef END ! call writefile(file, 'Xtest.vim', 'D') let buf = RunVimInTerminal('-S Xtest.vim', {}) *************** *** 1218,1224 **** call RunDbgCmd(buf, 'cont') call StopVimInTerminal(buf) - call delete('Xtest.vim') endfunc func Test_debug_def_function_with_lambda() --- 1204,1209 ---- *************** *** 1232,1238 **** enddef breakadd func 2 g:Func END ! call writefile(lines, 'XtestLambda.vim') let buf = RunVimInTerminal('-S XtestLambda.vim', {}) --- 1217,1223 ---- enddef breakadd func 2 g:Func END ! call writefile(lines, 'XtestLambda.vim', 'D') let buf = RunVimInTerminal('-S XtestLambda.vim', {}) *************** *** 1245,1251 **** call RunDbgCmd(buf, 'cont') call StopVimInTerminal(buf) - call delete('XtestLambda.vim') endfunc func Test_debug_backtrace_level() --- 1230,1235 ---- *************** *** 1263,1269 **** call s:File1Func( 'arg1' ) END ! call writefile(lines, 'Xtest1.vim') let lines =<< trim END let s:file2_var = 'file2' --- 1247,1253 ---- call s:File1Func( 'arg1' ) END ! call writefile(lines, 'Xtest1.vim', 'D') let lines =<< trim END let s:file2_var = 'file2' *************** *** 1276,1282 **** call s:File2Func( 'arg2' ) END ! call writefile(lines, 'Xtest2.vim') let file1 = getcwd() .. '/Xtest1.vim' let file2 = getcwd() .. '/Xtest2.vim' --- 1260,1266 ---- call s:File2Func( 'arg2' ) END ! call writefile(lines, 'Xtest2.vim', 'D') let file1 = getcwd() .. '/Xtest1.vim' let file2 = getcwd() .. '/Xtest2.vim' *************** *** 1437,1444 **** 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 --- 1421,1426 ---- *** ../vim-9.0.0524/src/testdir/test_diffmode.vim 2022-08-30 21:46:03.661214458 +0100 --- src/testdir/test_diffmode.vim 2022-09-20 21:59:56.100892946 +0100 *************** *** 874,880 **** set diffexpr= endfunc END ! call writefile(lines, 'XdiffSetup') " clean up already existing swap files, just in case call delete('.Xdifile1.swp') --- 874,880 ---- set diffexpr= endfunc END ! call writefile(lines, 'XdiffSetup', 'D') " clean up already existing swap files, just in case call delete('.Xdifile1.swp') *************** *** 1002,1008 **** call StopVimInTerminal(buf) call delete('Xdifile1') call delete('Xdifile2') - call delete('XdiffSetup') endfunc func Test_diff_with_scroll_and_change() --- 1002,1007 ---- *************** *** 1016,1022 **** wincmd h exe "normal Gl5\" END ! call writefile(lines, 'Xtest_scroll_change') let buf = RunVimInTerminal('-S Xtest_scroll_change', {}) call VerifyScreenDump(buf, 'Test_diff_scroll_change_01', {}) --- 1015,1021 ---- wincmd h exe "normal Gl5\" END ! call writefile(lines, 'Xtest_scroll_change', 'D') let buf = RunVimInTerminal('-S Xtest_scroll_change', {}) call VerifyScreenDump(buf, 'Test_diff_scroll_change_01', {}) *************** *** 1029,1035 **** " clean up call StopVimInTerminal(buf) - call delete('Xtest_scroll_change') endfunc func Test_diff_with_cursorline() --- 1028,1033 ---- *************** *** 1043,1049 **** \ 'call setline(1, ["bee","foo","foo","baz"])', \ 'windo diffthis', \ '2wincmd w', ! \ ], 'Xtest_diff_cursorline') let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {}) call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {}) --- 1041,1047 ---- \ 'call setline(1, ["bee","foo","foo","baz"])', \ 'windo diffthis', \ '2wincmd w', ! \ ], 'Xtest_diff_cursorline', 'D') let buf = RunVimInTerminal('-S Xtest_diff_cursorline', {}) call VerifyScreenDump(buf, 'Test_diff_with_cursorline_01', {}) *************** *** 1054,1060 **** " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_cursorline') endfunc func Test_diff_with_cursorline_number() --- 1052,1057 ---- *************** *** 1071,1077 **** windo diffthis 1wincmd w END ! call writefile(lines, 'Xtest_diff_cursorline_number') let buf = RunVimInTerminal('-S Xtest_diff_cursorline_number', {}) call VerifyScreenDump(buf, 'Test_diff_with_cursorline_number_01', {}) --- 1068,1074 ---- windo diffthis 1wincmd w END ! 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,1086 **** " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_cursorline_number') endfunc func Test_diff_with_cursorline_breakindent() --- 1077,1082 ---- *************** *** 1097,1103 **** \ 'exe "norm 20Abee\j20Afoo\j20Afoo\j20Abaz\"', \ 'windo diffthis', \ '2wincmd w', ! \ ], 'Xtest_diff_cursorline_breakindent') let buf = RunVimInTerminal('-S Xtest_diff_cursorline_breakindent', {}) call term_sendkeys(buf, "gg0") --- 1093,1099 ---- \ 'exe "norm 20Abee\j20Afoo\j20Afoo\j20Abaz\"', \ 'windo diffthis', \ '2wincmd w', ! \ ], 'Xtest_diff_cursorline_breakindent', 'D') let buf = RunVimInTerminal('-S Xtest_diff_cursorline_breakindent', {}) call term_sendkeys(buf, "gg0") *************** *** 1111,1117 **** " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_cursorline_breakindent') endfunc func Test_diff_with_syntax() --- 1107,1112 ---- *************** *** 1124,1130 **** return 5; } END ! call writefile(lines, 'Xprogram1.c') let lines =<< trim END void doSomething() { int x = 0; --- 1119,1125 ---- return 5; } END ! call writefile(lines, 'Xprogram1.c', 'D') let lines =<< trim END void doSomething() { int x = 0; *************** *** 1132,1153 **** return 5; } END ! call writefile(lines, 'Xprogram2.c') let lines =<< trim END edit Xprogram1.c diffsplit Xprogram2.c END ! call writefile(lines, 'Xtest_diff_syntax') 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() --- 1127,1145 ---- return 5; } END ! call writefile(lines, 'Xprogram2.c', 'D') let lines =<< trim END edit Xprogram1.c diffsplit Xprogram2.c END ! 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) endfunc func Test_diff_of_diff() *************** *** 1161,1167 **** \ 'windo diffthis', \ '1wincmd w', \ 'setlocal number', ! \ ], 'Xtest_diff_diff') let buf = RunVimInTerminal('-S Xtest_diff_diff', {}) call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {}) --- 1153,1159 ---- \ 'windo diffthis', \ '1wincmd w', \ 'setlocal number', ! \ ], 'Xtest_diff_diff', 'D') let buf = RunVimInTerminal('-S Xtest_diff_diff', {}) call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {}) *************** *** 1171,1177 **** " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_diff') endfunc func CloseoffSetup() --- 1163,1168 ---- *************** *** 1253,1260 **** endfunc set patchexpr=TPatch() ! call writefile(['input file'], 'Xinput') ! call writefile(['diff file'], 'Xdiff') %bwipe! edit Xinput diffpatch Xdiff --- 1244,1251 ---- endfunc set patchexpr=TPatch() ! call writefile(['input file'], 'Xinput', 'D') ! call writefile(['diff file'], 'Xdiff', 'D') %bwipe! edit Xinput diffpatch Xdiff *************** *** 1271,1278 **** set patchexpr=NewPatchExpr() call assert_equal(expand('') .. 'NewPatchExpr()', &patchexpr) - call delete('Xinput') - call delete('Xdiff') set patchexpr& delfunc TPatch delfunc s:NewPatchExpr --- 1262,1267 ---- *************** *** 1289,1295 **** windo diffthis setlocal number rnu foldcolumn=0 END ! call writefile(content, 'Xtest_diff_rnu') let buf = RunVimInTerminal('-S Xtest_diff_rnu', {}) call VerifyScreenDump(buf, 'Test_diff_rnu_01', {}) --- 1278,1284 ---- windo diffthis setlocal number rnu foldcolumn=0 END ! call writefile(content, 'Xtest_diff_rnu', 'D') let buf = RunVimInTerminal('-S Xtest_diff_rnu', {}) call VerifyScreenDump(buf, 'Test_diff_rnu_01', {}) *************** *** 1301,1307 **** " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_rnu') endfunc func Test_diff_multilineconceal() --- 1290,1295 ---- *************** *** 1349,1355 **** norm! gg0 redraw! END ! call writefile(content, 'Xtest_diff_cuc') let buf = RunVimInTerminal('-S Xtest_diff_cuc', {}) call VerifyScreenDump(buf, 'Test_diff_cuc_01', {}) --- 1337,1343 ---- norm! gg0 redraw! END ! call writefile(content, 'Xtest_diff_cuc', 'D') let buf = RunVimInTerminal('-S Xtest_diff_cuc', {}) call VerifyScreenDump(buf, 'Test_diff_cuc_01', {}) *************** *** 1366,1372 **** " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_cuc') endfunc " Test for adding/removing lines inside diff chunks, between diff chunks --- 1354,1359 ---- *************** *** 1465,1471 **** norm! gg0 redraw! END ! call writefile(content, 'Xtest_diff_bin') let buf = RunVimInTerminal('-S Xtest_diff_bin', {}) " Test using internal diff --- 1452,1458 ---- norm! gg0 redraw! END ! call writefile(content, 'Xtest_diff_bin', 'D') let buf = RunVimInTerminal('-S Xtest_diff_bin', {}) " Test using internal diff *************** *** 1486,1492 **** " clean up call StopVimInTerminal(buf) - call delete('Xtest_diff_bin') set diffopt&vim endfunc --- 1473,1478 ---- *************** *** 1556,1562 **** // containing // four lines END ! call writefile(left, 'Xleft') let right =<< trim END line 1 line 2 --- 1542,1548 ---- // containing // four lines END ! call writefile(left, 'Xleft', 'D') let right =<< trim END line 1 line 2 *************** *** 1592,1598 **** // containing // four lines END ! call writefile(right, 'Xright') let buf = RunVimInTerminal('-d Xleft Xright', {'rows': 12}) call term_sendkeys(buf, "\\jjjj") call VerifyScreenDump(buf, 'Test_diff_scroll_1', {}) --- 1578,1584 ---- // containing // four lines END ! 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,1607 **** 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 --- 1586,1591 ---- *** ../vim-9.0.0524/src/testdir/test_digraph.vim 2022-03-22 21:08:06.000000000 +0000 --- src/testdir/test_digraph.vim 2022-09-20 21:57:17.381124111 +0100 *************** *** 494,502 **** func Test_loadkeymap_error() CheckFeature keymap call assert_fails('loadkeymap', 'E105:') ! call writefile(['loadkeymap', 'a'], 'Xkeymap') call assert_fails('source Xkeymap', 'E791:') - call delete('Xkeymap') endfunc " Test for the characters displayed on the screen when entering a digraph --- 494,501 ---- func Test_loadkeymap_error() CheckFeature keymap call assert_fails('loadkeymap', 'E105:') ! call writefile(['loadkeymap', 'a'], 'Xkeymap', 'D') call assert_fails('source Xkeymap', 'E791:') endfunc " Test for the characters displayed on the screen when entering a digraph *** ../vim-9.0.0524/src/testdir/test_display.vim 2022-07-04 17:34:06.386292140 +0100 --- src/testdir/test_display.vim 2022-09-20 21:58:59.160975236 +0100 *************** *** 78,84 **** set t_cs= set laststatus=2 END ! call writefile(lines, 'Xtestscroll') let buf = RunVimInTerminal('-S Xtestscroll', #{rows: 10}) call VerifyScreenDump(buf, 'Test_scroll_no_region_1', {}) --- 78,84 ---- set t_cs= set laststatus=2 END ! call writefile(lines, 'Xtestscroll', 'D') let buf = RunVimInTerminal('-S Xtestscroll', #{rows: 10}) call VerifyScreenDump(buf, 'Test_scroll_no_region_1', {}) *************** *** 102,108 **** " clean up call StopVimInTerminal(buf) - call delete('Xtestscroll') endfunc func Test_display_listchars_precedes() --- 102,107 ---- *************** *** 172,185 **** exe ":norm! o\110ia\" END let filename = 'Xdrawscreen' ! call writefile(lines, filename) 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 --- 171,183 ---- exe ":norm! o\110ia\" END let filename = 'Xdrawscreen' ! 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) endfunc " check a long file name does not result in the hit-enter prompt *************** *** 187,214 **** CheckScreendump let longName = 'x'->repeat(min([&columns, 255])) ! call writefile([], longName) 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') let lines =<< trim END edit Xunix.txt split Xmac.txt edit ++ff=mac END let filename = 'Xunprintable' ! call writefile(lines, filename) let buf = RunVimInTerminal('-S '.filename, #{rows: 9, cols: 50}) call VerifyScreenDump(buf, 'Test_display_unprintable_01', {}) call term_sendkeys(buf, "\\\") --- 185,211 ---- CheckScreendump let longName = 'x'->repeat(min([&columns, 255])) ! 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) endfunc func Test_unprintable_fileformats() CheckScreendump ! 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, 'D') let buf = RunVimInTerminal('-S '.filename, #{rows: 9, cols: 50}) call VerifyScreenDump(buf, 'Test_display_unprintable_01', {}) call term_sendkeys(buf, "\\\") *************** *** 216,224 **** " 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 --- 213,218 ---- *************** *** 233,239 **** END let filename = 'Xvisualblockmodifiedscroll' ! call writefile(lines, filename) let buf = RunVimInTerminal('-S '.filename, #{rows: 7}) call term_sendkeys(buf, "V\\") --- 227,233 ---- END let filename = 'Xvisualblockmodifiedscroll' ! call writefile(lines, filename, 'D') let buf = RunVimInTerminal('-S '.filename, #{rows: 7}) call term_sendkeys(buf, "V\\") *************** *** 241,247 **** call VerifyScreenDump(buf, 'Test_display_visual_block_scroll', {}) call StopVimInTerminal(buf) - call delete(filename) endfunc func Test_display_scroll_at_topline() --- 235,240 ---- *************** *** 267,280 **** 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') 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' --- 260,272 ---- 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', '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) endfunc " Test for 'eob' (EndOfBuffer) item in 'fillchars' *************** *** 373,379 **** call setline(1, ['window 4']->repeat(3)) setlocal fillchars=stl:4,stlnc:d,vert:>,eob:o END ! call writefile(lines, 'Xdisplayfillchars') let buf = RunVimInTerminal('-S Xdisplayfillchars', #{rows: 12}) call VerifyScreenDump(buf, 'Test_display_fillchars_1', {}) --- 365,371 ---- call setline(1, ['window 4']->repeat(3)) setlocal fillchars=stl:4,stlnc:d,vert:>,eob:o END ! call writefile(lines, 'Xdisplayfillchars', 'D') let buf = RunVimInTerminal('-S Xdisplayfillchars', #{rows: 12}) call VerifyScreenDump(buf, 'Test_display_fillchars_1', {}) *************** *** 381,387 **** call VerifyScreenDump(buf, 'Test_display_fillchars_2', {}) call StopVimInTerminal(buf) - call delete('Xdisplayfillchars') endfunc func Test_display_linebreak_breakat() --- 373,378 ---- *************** *** 409,415 **** vsplit 100wincmd < END ! call writefile(lines, 'XdispLastline') let buf = RunVimInTerminal('-S XdispLastline', #{rows: 10}) call VerifyScreenDump(buf, 'Test_display_lastline_1', {}) --- 400,406 ---- vsplit 100wincmd < END ! call writefile(lines, 'XdispLastline', 'D') let buf = RunVimInTerminal('-S XdispLastline', #{rows: 10}) call VerifyScreenDump(buf, 'Test_display_lastline_1', {}) *************** *** 423,429 **** call VerifyScreenDump(buf, 'Test_display_lastline_4', {}) call StopVimInTerminal(buf) - call delete('XdispLastline') endfunc --- 414,419 ---- *** ../vim-9.0.0524/src/version.c 2022-09-20 21:23:08.788163488 +0100 --- src/version.c 2022-09-20 21:49:50.073814125 +0100 *************** *** 701,702 **** --- 701,704 ---- { /* Add new patch number below this line */ + /**/ + 525, /**/ -- hundred-and-one symptoms of being an internet addict: 116. You are living with your boyfriend who networks your respective computers so you can sit in separate rooms and email each other /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///