To: vim_dev@googlegroups.com Subject: Patch 9.0.0336 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0336 Problem: Tests are flaky because of using a common file name. Solution: Rename files and directories to be more unique. Files: src/testdir/test_autocmd.vim, src/testdir/test_buffer.vim, src/testdir/test_changelist.vim, src/testdir/test_clientserver.vim, src/testdir/test_cmdline.vim, src/testdir/test_cpoptions.vim, src/testdir/test_delete.vim, src/testdir/test_diffmode.vim, src/testdir/test_edit.vim, src/testdir/test_help_tagjump.vim, src/testdir/dumps/Test_diff_01.dump, src/testdir/dumps/Test_diff_02.dump, src/testdir/dumps/Test_diff_03.dump, src/testdir/dumps/Test_diff_04.dump, src/testdir/dumps/Test_diff_05.dump, src/testdir/dumps/Test_diff_06.dump, src/testdir/dumps/Test_diff_06.0.dump, src/testdir/dumps/Test_diff_06.1.dump, src/testdir/dumps/Test_diff_06.2.dump, src/testdir/dumps/Test_diff_07.dump, src/testdir/dumps/Test_diff_08.dump, src/testdir/dumps/Test_diff_09.dump, src/testdir/dumps/Test_diff_10.dump, src/testdir/dumps/Test_diff_11.dump, src/testdir/dumps/Test_diff_12.dump, src/testdir/dumps/Test_diff_13.dump, src/testdir/dumps/Test_diff_14.dump, src/testdir/dumps/Test_diff_15.dump, src/testdir/dumps/Test_diff_16.dump, src/testdir/dumps/Test_diff_17.dump, src/testdir/dumps/Test_diff_18.dump, src/testdir/dumps/Test_diff_19.dump, src/testdir/dumps/Test_diff_20.dump, src/testdir/dumps/Test_wildmenu_pum_14.dump, src/testdir/dumps/Test_wildmenu_pum_15.dump, src/testdir/dumps/Test_wildmenu_pum_16.dump, src/testdir/dumps/Test_wildmenu_pum_32.dump *** ../vim-9.0.0335/src/testdir/test_autocmd.vim 2022-08-30 18:17:11.546152303 +0100 --- src/testdir/test_autocmd.vim 2022-08-30 20:57:57.574502797 +0100 *************** *** 2229,2235 **** set acd cd .. call assert_equal([], s:li) ! exe 'edit ' . s:dir_foo . '/Xfile' call assert_equal(s:dir_foo, getcwd()) let expected = ["pre cd " .. s:dir_foo, "auto:", s:dir_foo] call assert_equal(expected, s:li) --- 2229,2235 ---- set acd cd .. call assert_equal([], s:li) ! exe 'edit ' . s:dir_foo . '/Xautofile' call assert_equal(s:dir_foo, getcwd()) let expected = ["pre cd " .. s:dir_foo, "auto:", s:dir_foo] call assert_equal(expected, s:li) *************** *** 2906,2912 **** augroup FileChangedROTest au! ! autocmd FileChangedRO * edit Xfile augroup END new set readonly --- 2906,2912 ---- augroup FileChangedROTest au! ! autocmd FileChangedRO * edit Xrofile augroup END new set readonly *************** *** 2982,2994 **** " Test for passing invalid arguments to autocmd func Test_autocmd_invalid_args() " Additional character after * for event ! call assert_fails('autocmd *a Xfile set ff=unix', 'E215:') augroup Test augroup END " Invalid autocmd event ! call assert_fails('autocmd Bufabc Xfile set ft=vim', 'E216:') " Invalid autocmd event in a autocmd group ! call assert_fails('autocmd Test Bufabc Xfile set ft=vim', 'E216:') augroup! Test " Execute all autocmds call assert_fails('doautocmd * BufEnter', 'E217:') --- 2982,2994 ---- " Test for passing invalid arguments to autocmd func Test_autocmd_invalid_args() " Additional character after * for event ! call assert_fails('autocmd *a Xinvfile set ff=unix', 'E215:') augroup Test augroup END " Invalid autocmd event ! call assert_fails('autocmd Bufabc Xinvfile set ft=vim', 'E216:') " Invalid autocmd event in a autocmd group ! call assert_fails('autocmd Test Bufabc Xinvfile set ft=vim', 'E216:') augroup! Test " Execute all autocmds call assert_fails('doautocmd * BufEnter', 'E217:') *************** *** 2999,3007 **** " Test for deep nesting of autocmds func Test_autocmd_deep_nesting() ! autocmd BufEnter Xfile doautocmd BufEnter Xfile ! call assert_fails('doautocmd BufEnter Xfile', 'E218:') ! autocmd! BufEnter Xfile endfunc " Tests for SigUSR1 autocmd event, which is only available on posix systems. --- 2999,3007 ---- " Test for deep nesting of autocmds func Test_autocmd_deep_nesting() ! autocmd BufEnter Xdeepfile doautocmd BufEnter Xdeepfile ! call assert_fails('doautocmd BufEnter Xdeepfile', 'E218:') ! autocmd! BufEnter Xdeepfile endfunc " Tests for SigUSR1 autocmd event, which is only available on posix systems. *** ../vim-9.0.0335/src/testdir/test_buffer.vim 2022-08-29 11:02:55.227279554 +0100 --- src/testdir/test_buffer.vim 2022-08-30 20:58:51.550392268 +0100 *************** *** 141,147 **** call assert_fails('bdelete \)', 'E55:') " Deleting a unlisted and unloaded buffer ! edit Xfile1 let bnr = bufnr() set nobuflisted enew --- 141,147 ---- call assert_fails('bdelete \)', 'E55:') " Deleting a unlisted and unloaded buffer ! edit Xbdelfile1 let bnr = bufnr() set nobuflisted enew *************** *** 315,322 **** " Test for trying to load a buffer with text locked " e in the command line is used to lock the text func Test_load_buf_with_text_locked() ! new Xfile1 ! edit Xfile2 let cmd = ":\eexecute(\"normal \\")\\" call assert_fails("call feedkeys(cmd, 'xt')", 'E565:') %bw! --- 315,322 ---- " Test for trying to load a buffer with text locked " e in the command line is used to lock the text func Test_load_buf_with_text_locked() ! new Xlockfile1 ! edit Xlockfile2 let cmd = ":\eexecute(\"normal \\")\\" call assert_fails("call feedkeys(cmd, 'xt')", 'E565:') %bw! *** ../vim-9.0.0335/src/testdir/test_changelist.vim 2022-05-28 10:41:34.000000000 +0100 --- src/testdir/test_changelist.vim 2022-08-30 20:59:41.114290644 +0100 *************** *** 37,49 **** " Tests for the getchangelist() function func Test_changelist_index() ! edit Xfile1.txt exe "normal iabc\u\ndef\u\nghi" call assert_equal(3, getchangelist('%')[1]) " Move one step back in the changelist. normal 2g; ! hide edit Xfile2.txt exe "normal iabcd\u\ndefg\u\nghij" call assert_equal(3, getchangelist('%')[1]) " Move to the beginning of the changelist. --- 37,49 ---- " Tests for the getchangelist() function func Test_changelist_index() ! edit Xgclfile1.txt exe "normal iabc\u\ndef\u\nghi" call assert_equal(3, getchangelist('%')[1]) " Move one step back in the changelist. normal 2g; ! hide edit Xgclfile2.txt exe "normal iabcd\u\ndefg\u\nghij" call assert_equal(3, getchangelist('%')[1]) " Move to the beginning of the changelist. *************** *** 54,61 **** call assert_equal(1, getchangelist('#')[1]) bwipe! ! call delete('Xfile1.txt') ! call delete('Xfile2.txt') endfunc func Test_getchangelist() --- 54,61 ---- call assert_equal(1, getchangelist('#')[1]) bwipe! ! call delete('Xgclfile1.txt') ! call delete('Xgclfile2.txt') endfunc func Test_getchangelist() *************** *** 64,73 **** call assert_equal([], 10->getchangelist()) call assert_equal([[], 0], getchangelist()) ! call writefile(['line1', 'line2', 'line3'], 'Xfile1.txt') ! call writefile(['line1', 'line2', 'line3'], 'Xfile2.txt') ! edit Xfile1.txt let buf_1 = bufnr() exe "normal 1Goline\u1.1" exe "normal 3Goline\u2.1" --- 64,73 ---- call assert_equal([], 10->getchangelist()) call assert_equal([[], 0], getchangelist()) ! call writefile(['line1', 'line2', 'line3'], 'Xclistfile1.txt') ! call writefile(['line1', 'line2', 'line3'], 'Xclistfile2.txt') ! edit Xclistfile1.txt let buf_1 = bufnr() exe "normal 1Goline\u1.1" exe "normal 3Goline\u2.1" *************** *** 79,85 **** \ {'lnum' : 6, 'col' : 4, 'coladd' : 0}], 2], \ getchangelist('%')) ! hide edit Xfile2.txt let buf_2 = bufnr() exe "normal 1GOline\u1.0" exe "normal 2Goline\u2.0" --- 79,85 ---- \ {'lnum' : 6, 'col' : 4, 'coladd' : 0}], 2], \ getchangelist('%')) ! hide edit Xclistfile2.txt let buf_2 = bufnr() exe "normal 1GOline\u1.0" exe "normal 2Goline\u2.0" *************** *** 100,107 **** \ getchangelist(buf_2)) bwipe! ! call delete('Xfile1.txt') ! call delete('Xfile2.txt') endfunc " vim: shiftwidth=2 sts=2 expandtab --- 100,107 ---- \ getchangelist(buf_2)) bwipe! ! call delete('Xclistfile1.txt') ! call delete('Xclistfile2.txt') endfunc " vim: shiftwidth=2 sts=2 expandtab *** ../vim-9.0.0335/src/testdir/test_clientserver.vim 2022-04-03 17:36:12.000000000 +0100 --- src/testdir/test_clientserver.vim 2022-08-30 21:01:07.390113377 +0100 *************** *** 130,138 **** " Run a separate instance to send a command to the server call remote_expr(name, 'execute("only")') ! call system(cmd .. ' --remote-send ":new Xfile"') call assert_equal('2', remote_expr(name, 'winnr("$")')) ! call assert_equal('Xfile', remote_expr(name, 'winbufnr(1)->bufname()')) call remote_expr(name, 'execute("only")') " Invoke a remote-expr. On MS-Windows, the returned value has a carriage --- 130,138 ---- " Run a separate instance to send a command to the server call remote_expr(name, 'execute("only")') ! call system(cmd .. ' --remote-send ":new Xclientfile"') call assert_equal('2', remote_expr(name, 'winnr("$")')) ! call assert_equal('Xclientfile', remote_expr(name, 'winbufnr(1)->bufname()')) call remote_expr(name, 'execute("only")') " Invoke a remote-expr. On MS-Windows, the returned value has a carriage *************** *** 141,164 **** call assert_equal(['4'], split(l, "\n")) " Edit multiple files using --remote ! call system(cmd .. ' --remote Xfile1 Xfile2 Xfile3') ! call assert_match(".*Xfile1\n.*Xfile2\n.*Xfile3\n", remote_expr(name, 'argv()')) eval name->remote_send(":%bw!\") " Edit files in separate tab pages ! call system(cmd .. ' --remote-tab Xfile1 Xfile2 Xfile3') call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))}) ! call assert_match('.*\remote_send(":%bw!\") " Edit a file using --remote-wait eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\") ! call system(cmd .. ' --remote-wait +enew Xfile1') ! call assert_match('.*\remote_send(":%bw!\") " Edit files using --remote-tab-wait ! call system(cmd .. ' --remote-tabwait +tabonly\|enew Xfile1 Xfile2') call assert_equal('1', remote_expr(name, 'tabpagenr("$")')) eval name->remote_send(":%bw!\") --- 141,164 ---- call assert_equal(['4'], split(l, "\n")) " Edit multiple files using --remote ! call system(cmd .. ' --remote Xclientfile1 Xclientfile2 Xclientfile3') ! call assert_match(".*Xclientfile1\n.*Xclientfile2\n.*Xclientfile3\n", remote_expr(name, 'argv()')) eval name->remote_send(":%bw!\") " Edit files in separate tab pages ! call system(cmd .. ' --remote-tab Xclientfile1 Xclientfile2 Xclientfile3') call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))}) ! call assert_match('.*\remote_send(":%bw!\") " Edit a file using --remote-wait eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\") ! call system(cmd .. ' --remote-wait +enew Xclientfile1') ! call assert_match('.*\remote_send(":%bw!\") " Edit files using --remote-tab-wait ! call system(cmd .. ' --remote-tabwait +tabonly\|enew Xclientfile1 Xclientfile2') call assert_equal('1', remote_expr(name, 'tabpagenr("$")')) eval name->remote_send(":%bw!\") *** ../vim-9.0.0335/src/testdir/test_cmdline.vim 2022-08-29 22:31:15.919685279 +0100 --- src/testdir/test_cmdline.vim 2022-08-30 21:09:02.206790549 +0100 *************** *** 1035,1048 **** call assert_equal("\"sI \", @:) " completion for :write command ! call mkdir('Xdir') ! call writefile(['one'], 'Xdir/Xfile1') let save_cwd = getcwd() ! cd Xdir call feedkeys(":w >> \\\"\", 'xt') call assert_equal("\"w >> Xfile1", @:) call chdir(save_cwd) ! call delete('Xdir', 'rf') " completion for :w ! and :r ! commands call feedkeys(":w !invalid_xyz_cmd\\\"\", 'xt') --- 1035,1048 ---- call assert_equal("\"sI \", @:) " completion for :write command ! call mkdir('Xcwdir') ! call writefile(['one'], 'Xcwdir/Xfile1') let save_cwd = getcwd() ! cd Xcwdir call feedkeys(":w >> \\\"\", 'xt') call assert_equal("\"w >> Xfile1", @:) call chdir(save_cwd) ! call delete('Xcwdir', 'rf') " completion for :w ! and :r ! commands call feedkeys(":w !invalid_xyz_cmd\\\"\", 'xt') *************** *** 1121,1132 **** call assert_equal("\"doautocmd BufNew,BufEnter", @:) " completion of file name in :doautocmd ! call writefile([], 'Xfile1') ! call writefile([], 'Xfile2') ! call feedkeys(":doautocmd BufEnter Xfi\\\"\", 'xt') ! call assert_equal("\"doautocmd BufEnter Xfile1 Xfile2", @:) ! call delete('Xfile1') ! call delete('Xfile2') " completion for the :augroup command augroup XTest.test --- 1121,1132 ---- call assert_equal("\"doautocmd BufNew,BufEnter", @:) " completion of file name in :doautocmd ! call writefile([], 'Xvarfile1') ! call writefile([], 'Xvarfile2') ! call feedkeys(":doautocmd BufEnter Xvarfi\\\"\", 'xt') ! call assert_equal("\"doautocmd BufEnter Xvarfile1 Xvarfile2", @:) ! call delete('Xvarfile1') ! call delete('Xvarfile2') " completion for the :augroup command augroup XTest.test *************** *** 1603,1619 **** " Test for using ~ for home directory in cmdline completion matches func Test_cmdline_expand_home() ! call mkdir('Xdir') ! call writefile([], 'Xdir/Xfile1') ! call writefile([], 'Xdir/Xfile2') ! cd Xdir let save_HOME = $HOME let $HOME = getcwd() call feedkeys(":e ~/\\\"\", 'xt') call assert_equal('"e ~/Xfile1 ~/Xfile2', @:) let $HOME = save_HOME cd .. ! call delete('Xdir', 'rf') endfunc " Test for using CTRL-\ CTRL-G in the command line to go back to normal mode --- 1603,1619 ---- " Test for using ~ for home directory in cmdline completion matches func Test_cmdline_expand_home() ! call mkdir('Xexpdir') ! call writefile([], 'Xexpdir/Xfile1') ! call writefile([], 'Xexpdir/Xfile2') ! cd Xexpdir let save_HOME = $HOME let $HOME = getcwd() call feedkeys(":e ~/\\\"\", 'xt') call assert_equal('"e ~/Xfile1 ~/Xfile2', @:) let $HOME = save_HOME cd .. ! call delete('Xexpdir', 'rf') endfunc " Test for using CTRL-\ CTRL-G in the command line to go back to normal mode *************** *** 1734,1748 **** endfunc func Test_custom_complete_autoload() ! call mkdir('Xdir/autoload', 'p') let save_rtp = &rtp ! exe 'set rtp=' .. getcwd() .. '/Xdir' let lines =<< trim END func vim8#Complete(a, c, p) return "oneA\noneB\noneC" endfunc END ! call writefile(lines, 'Xdir/autoload/vim8.vim') command -nargs=1 -complete=custom,vim8#Complete MyCmd set nowildmenu --- 1734,1748 ---- endfunc func Test_custom_complete_autoload() ! call mkdir('Xcustdir/autoload', 'p') let save_rtp = &rtp ! exe 'set rtp=' .. getcwd() .. '/Xcustdir' let lines =<< trim END func vim8#Complete(a, c, p) return "oneA\noneB\noneC" endfunc END ! call writefile(lines, 'Xcustdir/autoload/vim8.vim') command -nargs=1 -complete=custom,vim8#Complete MyCmd set nowildmenu *************** *** 1753,1759 **** let &rtp = save_rtp set wildmode& wildmenu& delcommand MyCmd ! call delete('Xdir', 'rf') endfunc " Test for interrupting the command-line completion --- 1753,1759 ---- let &rtp = save_rtp set wildmode& wildmenu& delcommand MyCmd ! call delete('Xcustdir', 'rf') endfunc " Test for interrupting the command-line completion *************** *** 2038,2068 **** " Test for the 'suffixes' option func Test_suffixes_opt() ! call writefile([], 'Xfile') ! call writefile([], 'Xfile.c') ! call writefile([], 'Xfile.o') set suffixes= ! call feedkeys(":e Xfi*\\\"\", 'xt') ! call assert_equal('"e Xfile Xfile.c Xfile.o', @:) ! call feedkeys(":e Xfi*\\\\"\", 'xt') ! call assert_equal('"e Xfile.c', @:) set suffixes=.c ! call feedkeys(":e Xfi*\\\"\", 'xt') ! call assert_equal('"e Xfile Xfile.o Xfile.c', @:) ! call feedkeys(":e Xfi*\\\\"\", 'xt') ! call assert_equal('"e Xfile.o', @:) set suffixes=,, ! call feedkeys(":e Xfi*\\\"\", 'xt') ! call assert_equal('"e Xfile.c Xfile.o Xfile', @:) ! call feedkeys(":e Xfi*\\\\"\", 'xt') ! call assert_equal('"e Xfile.o', @:) set suffixes& " Test for getcompletion() with different patterns ! call assert_equal(['Xfile', 'Xfile.c', 'Xfile.o'], getcompletion('Xfile', 'file')) ! call assert_equal(['Xfile'], getcompletion('Xfile$', 'file')) ! call delete('Xfile') ! call delete('Xfile.c') ! call delete('Xfile.o') endfunc " Test for using a popup menu for the command line completion matches --- 2038,2068 ---- " Test for the 'suffixes' option func Test_suffixes_opt() ! call writefile([], 'Xsuffile') ! call writefile([], 'Xsuffile.c') ! call writefile([], 'Xsuffile.o') set suffixes= ! call feedkeys(":e Xsuffi*\\\"\", 'xt') ! call assert_equal('"e Xsuffile Xsuffile.c Xsuffile.o', @:) ! call feedkeys(":e Xsuffi*\\\\"\", 'xt') ! call assert_equal('"e Xsuffile.c', @:) set suffixes=.c ! call feedkeys(":e Xsuffi*\\\"\", 'xt') ! call assert_equal('"e Xsuffile Xsuffile.o Xsuffile.c', @:) ! call feedkeys(":e Xsuffi*\\\\"\", 'xt') ! call assert_equal('"e Xsuffile.o', @:) set suffixes=,, ! call feedkeys(":e Xsuffi*\\\"\", 'xt') ! call assert_equal('"e Xsuffile.c Xsuffile.o Xsuffile', @:) ! call feedkeys(":e Xsuffi*\\\\"\", 'xt') ! call assert_equal('"e Xsuffile.o', @:) set suffixes& " Test for getcompletion() with different patterns ! call assert_equal(['Xsuffile', 'Xsuffile.c', 'Xsuffile.o'], getcompletion('Xsuffile', 'file')) ! call assert_equal(['Xsuffile'], getcompletion('Xsuffile$', 'file')) ! call delete('Xsuffile') ! call delete('Xsuffile.c') ! call delete('Xsuffile.o') endfunc " Test for using a popup menu for the command line completion matches *************** *** 2162,2173 **** call VerifyScreenDump(buf, 'Test_wildmenu_pum_13', {}) " Directory name completion ! call mkdir('Xdir/XdirA/XdirB', 'p') ! call writefile([], 'Xdir/XfileA') ! call writefile([], 'Xdir/XdirA/XfileB') ! call writefile([], 'Xdir/XdirA/XdirB/XfileC') ! call term_sendkeys(buf, "\e Xdi\\") call VerifyScreenDump(buf, 'Test_wildmenu_pum_14', {}) " Pressing on a directory name should go into that directory --- 2162,2173 ---- call VerifyScreenDump(buf, 'Test_wildmenu_pum_13', {}) " Directory name completion ! call mkdir('Xnamedir/XdirA/XdirB', 'p') ! call writefile([], 'Xnamedir/XfileA') ! call writefile([], 'Xnamedir/XdirA/XfileB') ! call writefile([], 'Xnamedir/XdirA/XdirB/XfileC') ! call term_sendkeys(buf, "\e Xnamedi\\") call VerifyScreenDump(buf, 'Test_wildmenu_pum_14', {}) " Pressing on a directory name should go into that directory *************** *** 2242,2254 **** call VerifyScreenDump(buf, 'Test_wildmenu_pum_31', {}) " Tests a directory name contained full-width characters. ! call mkdir('Xdir/あいう', 'p') ! call writefile([], 'Xdir/あいう/abc') ! call writefile([], 'Xdir/あいう/xyz') ! call writefile([], 'Xdir/あいう/123') call term_sendkeys(buf, "\set wildmode&\") ! call term_sendkeys(buf, ":\e Xdir/あいう/\") call VerifyScreenDump(buf, 'Test_wildmenu_pum_32', {}) " Pressing when the popup menu is displayed should list all the --- 2242,2254 ---- call VerifyScreenDump(buf, 'Test_wildmenu_pum_31', {}) " Tests a directory name contained full-width characters. ! call mkdir('Xnamedir/あいう', 'p') ! call writefile([], 'Xnamedir/あいう/abc') ! call writefile([], 'Xnamedir/あいう/xyz') ! call writefile([], 'Xnamedir/あいう/123') call term_sendkeys(buf, "\set wildmode&\") ! call term_sendkeys(buf, ":\e Xnamedir/あいう/\") call VerifyScreenDump(buf, 'Test_wildmenu_pum_32', {}) " Pressing when the popup menu is displayed should list all the *************** *** 2270,2276 **** " After using to expand all the filename matches, pressing " should not open the popup menu again. ! call term_sendkeys(buf, "\\:cd Xdir/XdirA\") call term_sendkeys(buf, ":e \\\") call VerifyScreenDump(buf, 'Test_wildmenu_pum_36', {}) call term_sendkeys(buf, "\\:cd -\") --- 2270,2276 ---- " After using to expand all the filename matches, pressing " should not open the popup menu again. ! call term_sendkeys(buf, "\\:cd Xnamedir/XdirA\") call term_sendkeys(buf, ":e \\\") call VerifyScreenDump(buf, 'Test_wildmenu_pum_36', {}) call term_sendkeys(buf, "\\:cd -\") *************** *** 2331,2337 **** call term_sendkeys(buf, "\\") call StopVimInTerminal(buf) call delete('Xtest') ! call delete('Xdir', 'rf') endfunc " Test for wildmenumode() with the cmdline popup menu --- 2331,2337 ---- call term_sendkeys(buf, "\\") call StopVimInTerminal(buf) call delete('Xtest') ! call delete('Xnamedir', 'rf') endfunc " Test for wildmenumode() with the cmdline popup menu *** ../vim-9.0.0335/src/testdir/test_cpoptions.vim 2022-08-28 17:44:13.937443970 +0100 --- src/testdir/test_cpoptions.vim 2022-08-30 21:15:27.827002536 +0100 *************** *** 31,47 **** " Wipe out all the buffers, so that the alternate file is empty edit Xfoo | %bw set cpo-=A ! new Xfile1 ! write Xfile2 call assert_equal('', @#) %bw ! call delete('Xfile2') ! new Xfile1 set cpo+=A ! write Xfile2 ! call assert_equal('Xfile2', @#) close! ! call delete('Xfile2') let &cpo = save_cpo endfunc --- 31,47 ---- " Wipe out all the buffers, so that the alternate file is empty edit Xfoo | %bw set cpo-=A ! new XcpoAfile1 ! write XcpoAfile2 call assert_equal('', @#) %bw ! call delete('XcpoAfile2') ! new XcpoAfile1 set cpo+=A ! write XcpoAfile2 ! call assert_equal('XcpoAfile2', @#) close! ! call delete('XcpoAfile2') let &cpo = save_cpo endfunc *** ../vim-9.0.0335/src/testdir/test_delete.vim 2022-08-29 22:31:15.919685279 +0100 --- src/testdir/test_delete.vim 2022-08-30 21:17:24.638975767 +0100 *************** *** 3,16 **** source check.vim func Test_file_delete() ! split Xfile call setline(1, ['a', 'b']) wq ! call assert_equal(['a', 'b'], readfile('Xfile')) ! call assert_equal(0, delete('Xfile')) ! call assert_fails('call readfile("Xfile")', 'E484:') ! call assert_equal(-1, delete('Xfile')) ! bwipe Xfile endfunc func Test_dir_delete() --- 3,16 ---- source check.vim func Test_file_delete() ! split Xfdelfile call setline(1, ['a', 'b']) wq ! call assert_equal(['a', 'b'], readfile('Xfdelfile')) ! call assert_equal(0, delete('Xfdelfile')) ! call assert_fails('call readfile("Xfdelfile")', 'E484:') ! call assert_equal(-1, delete('Xfdelfile')) ! bwipe Xfdelfile endfunc func Test_dir_delete() *************** *** 44,58 **** func Test_symlink_delete() CheckUnix ! split Xfile call setline(1, ['a', 'b']) wq ! silent !ln -s Xfile Xdellink " Delete the link, not the file call assert_equal(0, delete('Xdellink')) call assert_equal(-1, delete('Xdellink')) ! call assert_equal(0, delete('Xfile')) ! bwipe Xfile endfunc func Test_symlink_dir_delete() --- 44,58 ---- func Test_symlink_delete() CheckUnix ! split Xslfile call setline(1, ['a', 'b']) wq ! silent !ln -s Xslfile Xdellink " Delete the link, not the file call assert_equal(0, delete('Xdellink')) call assert_equal(-1, delete('Xdellink')) ! call assert_equal(0, delete('Xslfile')) ! bwipe Xslfile endfunc func Test_symlink_dir_delete() *** ../vim-9.0.0335/src/testdir/test_diffmode.vim 2022-08-17 12:09:41.748067732 +0100 --- src/testdir/test_diffmode.vim 2022-08-30 21:18:56.142935158 +0100 *************** *** 822,829 **** endfunc func WriteDiffFiles(buf, list1, list2) ! call writefile(a:list1, 'Xfile1') ! call writefile(a:list2, 'Xfile2') if a:buf call term_sendkeys(a:buf, ":checktime\") endif --- 822,829 ---- endfunc func WriteDiffFiles(buf, list1, list2) ! call writefile(a:list1, 'Xdifile1') ! call writefile(a:list2, 'Xdifile2') if a:buf call term_sendkeys(a:buf, ":checktime\") endif *************** *** 877,888 **** call writefile(lines, 'XdiffSetup') " clean up already existing swap files, just in case ! call delete('.Xfile1.swp') ! call delete('.Xfile2.swp') " Test 1: Add a line in beginning of file 2 call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) ! let buf = RunVimInTerminal('-d -S XdiffSetup Xfile1 Xfile2', {}) " Set autoread mode, so that Vim won't complain once we re-write the test " files call term_sendkeys(buf, ":set autoread\\w:set autoread\\w") --- 877,888 ---- call writefile(lines, 'XdiffSetup') " clean up already existing swap files, just in case ! call delete('.Xdifile1.swp') ! call delete('.Xdifile2.swp') " Test 1: Add a line in beginning of file 2 call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) ! let buf = RunVimInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {}) " Set autoread mode, so that Vim won't complain once we re-write the test " files call term_sendkeys(buf, ":set autoread\\w:set autoread\\w") *************** *** 1000,1007 **** " clean up call StopVimInTerminal(buf) ! call delete('Xfile1') ! call delete('Xfile2') call delete('XdiffSetup') endfunc --- 1000,1007 ---- " clean up call StopVimInTerminal(buf) ! call delete('Xdifile1') ! call delete('Xdifile2') call delete('XdiffSetup') endfunc *************** *** 1494,1502 **** " for the issue fixed by patch 6.2.317) func Test_diff_foldinvert() %bw! ! edit Xfile1 ! new Xfile2 ! new Xfile3 windo diffthis " open a non-diff window botright new --- 1494,1502 ---- " for the issue fixed by patch 6.2.317) func Test_diff_foldinvert() %bw! ! edit Xdoffile1 ! new Xdoffile2 ! new Xdoffile3 windo diffthis " open a non-diff window botright new *** ../vim-9.0.0335/src/testdir/test_edit.vim 2022-08-29 22:31:15.919685279 +0100 --- src/testdir/test_edit.vim 2022-08-30 21:20:23.542883023 +0100 *************** *** 424,430 **** " terminal. func Test_autoindent_remove_indent() CheckRunVimInTerminal ! let buf = RunVimInTerminal('-N Xfile', {'rows': 6, 'cols' : 20}) call TermWait(buf) call term_sendkeys(buf, ":set autoindent\n") " leaving insert mode in a new line with indent added by autoindent, should --- 424,430 ---- " terminal. func Test_autoindent_remove_indent() CheckRunVimInTerminal ! let buf = RunVimInTerminal('-N Xarifile', {'rows': 6, 'cols' : 20}) call TermWait(buf) call term_sendkeys(buf, ":set autoindent\n") " leaving insert mode in a new line with indent added by autoindent, should *************** *** 442,449 **** call term_sendkeys(buf, ":w\n") call TermWait(buf) call StopVimInTerminal(buf) ! call assert_equal(["\tfoo", '', repeat('x', 20)], readfile('Xfile')) ! call delete('Xfile') endfunc func Test_edit_CR() --- 442,449 ---- call term_sendkeys(buf, ":w\n") call TermWait(buf) call StopVimInTerminal(buf) ! call assert_equal(["\tfoo", '', repeat('x', 20)], readfile('Xarifile')) ! call delete('Xarifile') endfunc func Test_edit_CR() *************** *** 1530,1536 **** let longfilename = longdirname . '/' . repeat('a', 255) call writefile(['Totum', 'Table'], longfilename) new ! exe "next Xfile " . longfilename exe "normal iT\" bwipe! --- 1530,1536 ---- let longfilename = longdirname . '/' . repeat('a', 255) call writefile(['Totum', 'Table'], longfilename) new ! exe "next Xnofile " . longfilename exe "normal iT\" bwipe! *************** *** 1754,1772 **** " Test for editing a file using invalid file encoding func Test_edit_invalid_encoding() CheckEnglish ! call writefile([], 'Xfile') redir => msg ! new ++enc=axbyc Xfile redir END call assert_match('\[NOT converted\]', msg) ! call delete('Xfile') close! endfunc " Test for the "charconvert" option func Test_edit_charconvert() CheckEnglish ! call writefile(['one', 'two'], 'Xfile') " set 'charconvert' to a non-existing function set charconvert=NonExitingFunc() --- 1754,1772 ---- " Test for editing a file using invalid file encoding func Test_edit_invalid_encoding() CheckEnglish ! call writefile([], 'Xinvfile') redir => msg ! new ++enc=axbyc Xinvfile redir END call assert_match('\[NOT converted\]', msg) ! call delete('Xinvfile') close! endfunc " Test for the "charconvert" option func Test_edit_charconvert() CheckEnglish ! call writefile(['one', 'two'], 'Xccfile') " set 'charconvert' to a non-existing function set charconvert=NonExitingFunc() *************** *** 1774,1780 **** let caught_e117 = v:false try redir => msg ! edit ++enc=axbyc Xfile catch /E117:/ let caught_e117 = v:true finally --- 1774,1780 ---- let caught_e117 = v:false try redir => msg ! edit ++enc=axbyc Xccfile catch /E117:/ let caught_e117 = v:true finally *************** *** 1792,1798 **** set charconvert=Cconv1() new redir => msg ! edit ++enc=axbyc Xfile redir END call assert_equal(['one', 'two'], getline(1, '$')) call assert_match("can't read output of 'charconvert'", msg) --- 1792,1798 ---- set charconvert=Cconv1() new redir => msg ! edit ++enc=axbyc Xccfile redir END call assert_equal(['one', 'two'], getline(1, '$')) call assert_match("can't read output of 'charconvert'", msg) *************** *** 1807,1816 **** call writefile(data, v:fname_out) endfunc set charconvert=Cconv2() ! new Xfile ! write ++enc=ucase Xfile1 ! call assert_equal(['ONE', 'TWO'], readfile('Xfile1')) ! call delete('Xfile1') close! delfunc Cconv2 set charconvert& --- 1807,1816 ---- call writefile(data, v:fname_out) endfunc set charconvert=Cconv2() ! new Xccfile ! write ++enc=ucase Xccfile1 ! call assert_equal(['ONE', 'TWO'], readfile('Xccfile1')) ! call delete('Xccfile1') close! delfunc Cconv2 set charconvert& *************** *** 1821,1833 **** endfunc set charconvert=Cconv3() new ! call assert_fails('edit ++enc=lcase Xfile', 'E202:') call assert_equal([''], getline(1, '$')) close! delfunc Cconv3 set charconvert& ! call delete('Xfile') endfunc " Test for editing a file without read permission --- 1821,1833 ---- endfunc set charconvert=Cconv3() new ! call assert_fails('edit ++enc=lcase Xccfile', 'E202:') call assert_equal([''], getline(1, '$')) close! delfunc Cconv3 set charconvert& ! call delete('Xccfile') endfunc " Test for editing a file without read permission *************** *** 1835,1851 **** CheckUnix CheckNotRoot ! call writefile(['one', 'two'], 'Xfile') ! call setfperm('Xfile', '-w-------') new redir => msg ! edit Xfile redir END call assert_equal(1, &readonly) call assert_equal([''], getline(1, '$')) call assert_match('\[Permission Denied\]', msg) close! ! call delete('Xfile') endfunc " Using :edit without leaving 'insertmode' should not cause Insert mode to be --- 1835,1851 ---- CheckUnix CheckNotRoot ! call writefile(['one', 'two'], 'Xnrpfile') ! call setfperm('Xnrpfile', '-w-------') new redir => msg ! edit Xnrpfile redir END call assert_equal(1, &readonly) call assert_equal([''], getline(1, '$')) call assert_match('\[Permission Denied\]', msg) close! ! call delete('Xnrpfile') endfunc " Using :edit without leaving 'insertmode' should not cause Insert mode to be *** ../vim-9.0.0335/src/testdir/test_help_tagjump.vim 2020-10-11 17:46:27.000000000 +0100 --- src/testdir/test_help_tagjump.vim 2022-08-29 21:40:36.473113328 +0100 *************** *** 183,196 **** func s:doc_config_setup() let s:helpfile_save = &helpfile ! let &helpfile="Xdir1/doc-en/doc/testdoc.txt" let s:rtp_save = &rtp ! let &rtp="Xdir1/doc-en" if has('multi_lang') let s:helplang_save=&helplang endif ! call delete('Xdir1', 'rf') for lang in s:langs if lang ==# 'en' --- 183,196 ---- func s:doc_config_setup() let s:helpfile_save = &helpfile ! let &helpfile="Xdocdir1/doc-en/doc/testdoc.txt" let s:rtp_save = &rtp ! let &rtp="Xdocdir1/doc-en" if has('multi_lang') let s:helplang_save=&helplang endif ! call delete('Xdocdir1', 'rf') for lang in s:langs if lang ==# 'en' *************** *** 200,206 **** let tagfname = 'tags-' . lang let docfname = 'testdoc.' . lang . 'x' endif ! let docdir = "Xdir1/doc-" . lang . "/doc" call mkdir(docdir, "p") call writefile(["\t*test-char*", "\t*test-col*"], docdir . '/' . docfname) call writefile(["test-char\t" . docfname . "\t/*test-char*", --- 200,206 ---- let tagfname = 'tags-' . lang let docfname = 'testdoc.' . lang . 'x' endif ! let docdir = "Xdocdir1/doc-" . lang . "/doc" call mkdir(docdir, "p") call writefile(["\t*test-char*", "\t*test-col*"], docdir . '/' . docfname) call writefile(["test-char\t" . docfname . "\t/*test-char*", *************** *** 210,216 **** endfunc func s:doc_config_teardown() ! call delete('Xdir1', 'rf') let &helpfile = s:helpfile_save let &rtp = s:rtp_save --- 210,216 ---- endfunc func s:doc_config_teardown() ! call delete('Xdocdir1', 'rf') let &helpfile = s:helpfile_save let &rtp = s:rtp_save *************** *** 242,248 **** call assert_equal(['test-col', 'test-char'], list) " 'helplang=' and help file lang is 'en' and 'ab' ! set rtp+=Xdir1/doc-ab set helplang= let list = s:get_help_compl_list("test") call assert_equal(sort(['test-col@en', 'test-col@ab', --- 242,248 ---- call assert_equal(['test-col', 'test-char'], list) " 'helplang=' and help file lang is 'en' and 'ab' ! set rtp+=Xdocdir1/doc-ab set helplang= let list = s:get_help_compl_list("test") call assert_equal(sort(['test-col@en', 'test-col@ab', *************** *** 255,261 **** \ 'test-char', 'test-char@en']), sort(list)) " 'helplang=' and help file lang is 'en', 'ab' and 'ja' ! set rtp+=Xdir1/doc-ja set helplang= let list = s:get_help_compl_list("test") call assert_equal(sort(['test-col@en', 'test-col@ab', --- 255,261 ---- \ 'test-char', 'test-char@en']), sort(list)) " 'helplang=' and help file lang is 'en', 'ab' and 'ja' ! set rtp+=Xdocdir1/doc-ja set helplang= let list = s:get_help_compl_list("test") call assert_equal(sort(['test-col@en', 'test-col@ab', *************** *** 298,305 **** helpclose endfunc ! set rtp+=Xdir1/doc-ab ! set rtp+=Xdir1/doc-ja set helplang=ab call s:check_help_file_ext('test-char', 'abx') --- 298,305 ---- helpclose endfunc ! set rtp+=Xdocdir1/doc-ab ! set rtp+=Xdocdir1/doc-ja set helplang=ab call s:check_help_file_ext('test-char', 'abx') *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_01.dump 2019-03-29 16:11:57.000000000 +0000 --- src/testdir/dumps/Test_diff_01.dump 2022-08-30 21:22:35.794784040 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_02.dump 2019-03-29 16:11:58.000000000 +0000 --- src/testdir/dumps/Test_diff_02.dump 2022-08-30 21:22:36.974783062 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_03.dump 2019-03-29 16:11:59.000000000 +0000 --- src/testdir/dumps/Test_diff_03.dump 2022-08-30 21:22:38.158782082 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_04.dump 2019-03-30 14:58:11.000000000 +0000 --- src/testdir/dumps/Test_diff_04.dump 2022-08-30 21:22:39.338781100 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_05.dump 2019-03-29 16:12:01.000000000 +0000 --- src/testdir/dumps/Test_diff_05.dump 2022-08-30 21:22:40.522780113 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_06.dump 2019-03-29 16:12:02.000000000 +0000 --- src/testdir/dumps/Test_diff_06.dump 2022-08-30 21:22:41.710779122 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_06.0.dump 2019-03-29 16:12:05.000000000 +0000 --- src/testdir/dumps/Test_diff_06.0.dump 2022-08-30 21:22:45.238776169 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|0| @51 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|0| @51 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_06.1.dump 2019-03-29 16:12:04.000000000 +0000 --- src/testdir/dumps/Test_diff_06.1.dump 2022-08-30 21:22:44.062777154 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|1| @51 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|1| @51 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_06.2.dump 2019-03-29 16:12:03.000000000 +0000 --- src/testdir/dumps/Test_diff_06.2.dump 2022-08-30 21:22:42.886778140 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&@1|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|2| @50 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&@1|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|2| @50 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_07.dump 2018-09-10 16:36:51.000000000 +0100 --- src/testdir/dumps/Test_diff_07.dump 2022-08-30 21:22:46.434775163 +0100 *************** *** 16,20 **** | +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|i+0#0000000#5fd7ff255|n|t| |f|r|o|b|n|i|t|z|(|i|n|t| |f|o@1|)| @13 | +0#0000e05#a8a8a8255@1|{+0#0000000#ffffff0| @33||+1&&| +0#0000e05#a8a8a8255@1|{+0#0000000#ffffff0| @33 | +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@3|i|f+2&#ff404010|(|n| |>| |1|)| +0&#ffd7ff255@21||+1&#ffffff0| +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@3|i|n+2&#ff404010|t| |i|;| +0&#ffd7ff255@24 ! |X+3&#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 --- 16,20 ---- | +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|i+0#0000000#5fd7ff255|n|t| |f|r|o|b|n|i|t|z|(|i|n|t| |f|o@1|)| @13 | +0#0000e05#a8a8a8255@1|{+0#0000000#ffffff0| @33||+1&&| +0#0000e05#a8a8a8255@1|{+0#0000000#ffffff0| @33 | +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@3|i|f+2&#ff404010|(|n| |>| |1|)| +0&#ffd7ff255@21||+1&#ffffff0| +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@3|i|n+2&#ff404010|t| |i|;| +0&#ffd7ff255@24 ! |X+3&#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_08.dump 2018-09-10 16:36:51.000000000 +0100 --- src/testdir/dumps/Test_diff_08.dump 2022-08-30 21:22:47.614774174 +0100 *************** *** 16,20 **** | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@7|p|r|i|n|t|f|(|"|Y|o|u|r| |a|n|s|w|e|r| |i|s|:| |"|)|;||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34 ! |X+3#0000000#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|a|l|g|o|r|i|t|h|m|:|p|a|t|i|e|n|c|e| @42 --- 16,20 ---- | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@7|p|r|i|n|t|f|(|"|Y|o|u|r| |a|n|s|w|e|r| |i|s|:| |"|)|;||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34 ! |X+3#0000000#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|a|l|g|o|r|i|t|h|m|:|p|a|t|i|e|n|c|e| @42 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_09.dump 2018-12-04 21:21:18.000000000 +0000 --- src/testdir/dumps/Test_diff_09.dump 2022-08-30 21:22:48.798773176 +0100 *************** *** 16,20 **** | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@7|p|r|i|n|t|f|(|"|Y|o|u|r| |a|n|s|w|e|r| |i|s|:| |"|)|;||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34 ! |X+3#0000000#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|a|l|g|o|r|i|t|h|m|:|h|i|s|t|o|g|r|a|m| @41 --- 16,20 ---- | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@7|p|r|i|n|t|f|(|"|Y|o|u|r| |a|n|s|w|e|r| |i|s|:| |"|)|;||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34 ! |X+3#0000000#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|a|l|g|o|r|i|t|h|m|:|h|i|s|t|o|g|r|a|m| @41 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_10.dump 2019-03-29 16:12:07.000000000 +0000 --- src/testdir/dumps/Test_diff_10.dump 2022-08-30 21:22:49.982772179 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|0|-|1| @9|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|0|-|1| @9|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_11.dump 2019-03-29 16:12:10.000000000 +0000 --- src/testdir/dumps/Test_diff_11.dump 2022-08-30 21:22:53.514769192 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|0|-|1| @9|A|l@1 |:+0&&| @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|0|-|1| @9|A|l@1 |:+0&&| @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_12.dump 2019-03-29 16:12:11.000000000 +0000 --- src/testdir/dumps/Test_diff_12.dump 2022-08-30 21:22:54.694768191 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_13.dump 2019-03-29 16:12:12.000000000 +0000 --- src/testdir/dumps/Test_diff_13.dump 2022-08-30 21:22:55.874767190 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|0|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|0|,|0|-|1| @9|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|0|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|0|,|0|-|1| @9|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_14.dump 2019-03-29 16:12:13.000000000 +0000 --- src/testdir/dumps/Test_diff_14.dump 2022-08-30 21:22:57.062766179 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_15.dump 2019-03-29 16:12:14.000000000 +0000 --- src/testdir/dumps/Test_diff_15.dump 2022-08-30 21:22:58.250765167 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|&|v|i|m| |d|i|f@1|o|p|t|+|=|f|i|l@1|e|r| |d|i|f@1|o|p|t|+|=|i|w|h|i|t|e| @26 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|&|v|i|m| |d|i|f@1|o|p|t|+|=|f|i|l@1|e|r| |d|i|f@1|o|p|t|+|=|i|w|h|i|t|e| @26 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_16.dump 2019-03-29 16:12:15.000000000 +0000 --- src/testdir/dumps/Test_diff_16.dump 2022-08-30 21:22:59.426764163 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_17.dump 2019-03-29 16:12:16.000000000 +0000 --- src/testdir/dumps/Test_diff_17.dump 2022-08-30 21:23:00.602763159 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_18.dump 2019-03-29 16:12:19.000000000 +0000 --- src/testdir/dumps/Test_diff_18.dump 2022-08-30 21:23:04.122760144 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_19.dump 2019-03-29 16:12:20.000000000 +0000 --- src/testdir/dumps/Test_diff_19.dump 2022-08-30 21:23:05.310759122 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_diff_20.dump 2019-03-29 16:12:21.000000000 +0000 --- src/testdir/dumps/Test_diff_20.dump 2022-08-30 21:23:06.486758110 +0100 *************** *** 16,20 **** |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 |:+0&&> @73 --- 16,20 ---- |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 ! |X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 *** ../vim-9.0.0335/src/testdir/dumps/Test_wildmenu_pum_14.dump 2022-02-08 11:13:54.000000000 +0000 --- src/testdir/dumps/Test_wildmenu_pum_14.dump 2022-08-30 21:09:27.638823736 +0100 *************** *** 5,10 **** |~| @73 |~| @73 |~| @73 ! |~| @5| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@51 ! |~| @5| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@51 ! |:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/> @60 --- 5,10 ---- |~| @73 |~| @73 |~| @73 ! |~| @9| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@47 ! |~| @9| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@47 ! |:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/> @56 *** ../vim-9.0.0335/src/testdir/dumps/Test_wildmenu_pum_15.dump 2022-02-08 11:13:54.000000000 +0000 --- src/testdir/dumps/Test_wildmenu_pum_15.dump 2022-08-30 21:09:28.794825166 +0100 *************** *** 5,10 **** |~| @73 |~| @73 |~| @73 ! |~| @11| +0#0000001#e0e0e08|X|d|i|r|B|/| @8| +0#4040ff13#ffffff0@45 ! |~| @11| +0#0000001#ffd7ff255|X|f|i|l|e|B| @8| +0#4040ff13#ffffff0@45 ! |:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/|X|d|i|r|B|/> @54 --- 5,10 ---- |~| @73 |~| @73 |~| @73 ! |~| @15| +0#0000001#e0e0e08|X|d|i|r|B|/| @8| +0#4040ff13#ffffff0@41 ! |~| @15| +0#0000001#ffd7ff255|X|f|i|l|e|B| @8| +0#4040ff13#ffffff0@41 ! |:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/|X|d|i|r|B|/> @50 *** ../vim-9.0.0335/src/testdir/dumps/Test_wildmenu_pum_16.dump 2022-02-08 11:13:54.000000000 +0000 --- src/testdir/dumps/Test_wildmenu_pum_16.dump 2022-08-30 21:09:29.950826584 +0100 *************** *** 5,10 **** |~| @73 |~| @73 |~| @73 ! |~| @5| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@51 ! |~| @5| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@51 ! |:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/> @60 --- 5,10 ---- |~| @73 |~| @73 |~| @73 ! |~| @9| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@47 ! |~| @9| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@47 ! |:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/> @56 *** ../vim-9.0.0335/src/testdir/dumps/Test_wildmenu_pum_32.dump 2022-02-09 11:48:09.000000000 +0000 --- src/testdir/dumps/Test_wildmenu_pum_32.dump 2022-08-30 21:12:34.994975615 +0100 *************** *** 4,10 **** |~| @73 |~| @73 |~| @73 ! |~| @12| +0#0000001#e0e0e08|1|2|3| @11| +0#4040ff13#ffffff0@44 ! |~| @12| +0#0000001#ffd7ff255|a|b|c| @11| +0#4040ff13#ffffff0@44 ! |~| @12| +0#0000001#ffd7ff255|x|y|z| @11| +0#4040ff13#ffffff0@44 ! |:+0#0000000&|e| |X|d|i|r|/|あ*&|い|う|/+&|1|2|3> @56 --- 4,10 ---- |~| @73 |~| @73 |~| @73 ! |~| @16| +0#0000001#e0e0e08|1|2|3| @11| +0#4040ff13#ffffff0@40 ! |~| @16| +0#0000001#ffd7ff255|a|b|c| @11| +0#4040ff13#ffffff0@40 ! |~| @16| +0#0000001#ffd7ff255|x|y|z| @11| +0#4040ff13#ffffff0@40 ! |:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|あ*&|い|う|/+&|1|2|3> @52 *** ../vim-9.0.0335/src/version.c 2022-08-30 19:48:17.210760193 +0100 --- src/version.c 2022-08-30 21:43:49.600652870 +0100 *************** *** 709,710 **** --- 709,712 ---- { /* Add new patch number below this line */ + /**/ + 336, /**/ -- I used to wonder about the meaning of life. But I looked it up in the dictionary under "L" and there it was - the meaning of life. It was less than I expected. - Dogbert /// 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 ///