To: vim_dev@googlegroups.com Subject: Patch 8.2.3637 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.3637 Problem: Typos in test files. Solution: Correct the typos. (Dominique Pellé, closes #9175) Files: src/testdir/runtest.vim, src/testdir/test_debugger.vim, src/testdir/test_diffmode.vim, src/testdir/test_edit.vim, src/testdir/test_excmd.vim, src/testdir/test_flatten.vim, src/testdir/test_ins_complete.vim, src/testdir/test_normal.vim, src/testdir/test_options.vim, src/testdir/test_python2.vim, src/testdir/test_python3.vim, src/testdir/test_quickfix.vim, src/testdir/test_recover.vim, src/testdir/test_spellfile.vim, src/testdir/test_syntax.vim, src/testdir/test_termcodes.vim, src/testdir/test_textobjects.vim, src/testdir/test_trycatch.vim, src/testdir/test_vim9_script.vim, src/testdir/test_viminfo.vim *** ../vim-8.2.3636/src/testdir/runtest.vim 2021-11-03 22:31:41.210956684 +0000 --- src/testdir/runtest.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 145,151 **** endif if has('mac') ! " In MacOS, when starting a shell in a terminal, a bash deprecation warning " message is displayed. This breaks the terminal test. Disable the warning " message. let $BASH_SILENCE_DEPRECATION_WARNING = 1 --- 145,151 ---- endif if has('mac') ! " In macOS, when starting a shell in a terminal, a bash deprecation warning " message is displayed. This breaks the terminal test. Disable the warning " message. let $BASH_SILENCE_DEPRECATION_WARNING = 1 *** ../vim-8.2.3636/src/testdir/test_debugger.vim 2021-09-09 11:34:15.661539702 +0100 --- src/testdir/test_debugger.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 500,506 **** call RunDbgCmd( buf, 'down', [ 'frame is zero' ] ) ! " step until we have another meaninfgul trace call RunDbgCmd(buf, 'step', ['line 5: func File2Function()']) call RunDbgCmd(buf, 'step', ['line 9: call File2Function()']) call RunDbgCmd(buf, 'backtrace', [ --- 500,506 ---- call RunDbgCmd( buf, 'down', [ 'frame is zero' ] ) ! " step until we have another meaningful trace call RunDbgCmd(buf, 'step', ['line 5: func File2Function()']) call RunDbgCmd(buf, 'step', ['line 9: call File2Function()']) call RunDbgCmd(buf, 'backtrace', [ *************** *** 588,594 **** \ ['cmd: doautocmd User TestGlobalFunction']) call RunDbgCmd(buf, 'step', ['cmd: call GlobalFunction() | echo "Done"']) ! " At this point the ontly thing in the stack is the autocommand call RunDbgCmd(buf, 'backtrace', [ \ '>backtrace', \ '->0 User Autocommands for "TestGlobalFunction"', --- 588,594 ---- \ ['cmd: doautocmd User TestGlobalFunction']) call RunDbgCmd(buf, 'step', ['cmd: call GlobalFunction() | echo "Done"']) ! " At this point the only thing in the stack is the autocommand call RunDbgCmd(buf, 'backtrace', [ \ '>backtrace', \ '->0 User Autocommands for "TestGlobalFunction"', *************** *** 718,724 **** call RunDbgCmd( buf, 'down', [ 'frame is zero' ] ) ! " step until we have another meaninfgul trace call RunDbgCmd(buf, 'step', ['line 5: func File2Function()']) call RunDbgCmd(buf, 'step', ['line 9: call File2Function()']) call RunDbgCmd(buf, 'backtrace', [ --- 718,724 ---- call RunDbgCmd( buf, 'down', [ 'frame is zero' ] ) ! " step until we have another meaningful trace call RunDbgCmd(buf, 'step', ['line 5: func File2Function()']) call RunDbgCmd(buf, 'step', ['line 9: call File2Function()']) call RunDbgCmd(buf, 'backtrace', [ *************** *** 845,851 **** call CheckDbgOutput(buf, ['command line', \ 'cmd: call GlobalFunction()'], #{msec: 5000}) ! " At this point the ontly thing in the stack is the cmdline call RunDbgCmd(buf, 'backtrace', [ \ '>backtrace', \ '->0 command line', --- 845,851 ---- call CheckDbgOutput(buf, ['command line', \ 'cmd: call GlobalFunction()'], #{msec: 5000}) ! " At this point the only thing in the stack is the cmdline call RunDbgCmd(buf, 'backtrace', [ \ '>backtrace', \ '->0 command line', *************** *** 1260,1266 **** \ #{ match: 'pattern' } ) " Expression evaluation in the script frame (not the function frame) ! " FIXME: Unexpected in this scope (a: should not be visibnle) call RunDbgCmd(buf, 'echo a:arg', [ 'arg1' ] ) call RunDbgCmd(buf, 'echo s:file1_var', [ 'file1' ] ) call RunDbgCmd(buf, 'echo g:global_var', [ 'global' ] ) --- 1260,1266 ---- \ #{ match: 'pattern' } ) " Expression evaluation in the script frame (not the function frame) ! " FIXME: Unexpected in this scope (a: should not be visible) call RunDbgCmd(buf, 'echo a:arg', [ 'arg1' ] ) call RunDbgCmd(buf, 'echo s:file1_var', [ 'file1' ] ) call RunDbgCmd(buf, 'echo g:global_var', [ 'global' ] ) *** ../vim-8.2.3636/src/testdir/test_diffmode.vim 2021-10-22 20:56:35.211118936 +0100 --- src/testdir/test_diffmode.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 274,280 **** endfunc " :diffput and :diffget completes names of buffers which ! " are in diff mode and which are different then current buffer. " No completion when the current window is not in diff mode. func Test_diffget_diffput_completion() e Xdiff1 | diffthis --- 274,280 ---- endfunc " :diffput and :diffget completes names of buffers which ! " are in diff mode and which are different than current buffer. " No completion when the current window is not in diff mode. func Test_diffget_diffput_completion() e Xdiff1 | diffthis *************** *** 677,683 **** call assert_notequal(normattr, screenattr(3, 1)) diffoff! ! " Try using an non-existing function for 'diffexpr'. set diffexpr=NewDiffFunc() call assert_fails('windo diffthis', ['E117:', 'E97:']) diffoff! --- 677,683 ---- call assert_notequal(normattr, screenattr(3, 1)) diffoff! ! " Try using a non-existing function for 'diffexpr'. set diffexpr=NewDiffFunc() call assert_fails('windo diffthis', ['E117:', 'E97:']) diffoff! *** ../vim-8.2.3636/src/testdir/test_edit.vim 2021-11-17 16:52:36.786672588 +0000 --- src/testdir/test_edit.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 422,434 **** " leaving insert mode in a new line with indent added by autoindent, should " remove the indent. call term_sendkeys(buf, "i\foo\\") ! " Need to delay for sometime, otherwise the code in getchar.c will not be " exercised. call TermWait(buf, 50) " when a line is wrapped and the cursor is at the start of the second line, " leaving insert mode, should move the cursor back to the first line. call term_sendkeys(buf, "o" .. repeat('x', 20) .. "\") ! " Need to delay for sometime, otherwise the code in getchar.c will not be " exercised. call TermWait(buf, 50) call term_sendkeys(buf, ":w\n") --- 422,434 ---- " leaving insert mode in a new line with indent added by autoindent, should " remove the indent. call term_sendkeys(buf, "i\foo\\") ! " Need to delay for some time, otherwise the code in getchar.c will not be " exercised. call TermWait(buf, 50) " when a line is wrapped and the cursor is at the start of the second line, " leaving insert mode, should move the cursor back to the first line. call term_sendkeys(buf, "o" .. repeat('x', 20) .. "\") ! " Need to delay for some time, otherwise the code in getchar.c will not be " exercised. call TermWait(buf, 50) call term_sendkeys(buf, ":w\n") *************** *** 440,446 **** func Test_edit_CR() " Test for in insert mode ! " basically only in quickfix mode ist tested, the rest " has been taken care of by other tests CheckFeature quickfix botright new --- 440,446 ---- func Test_edit_CR() " Test for in insert mode ! " basically only in quickfix mode it's tested, the rest " has been taken care of by other tests CheckFeature quickfix botright new *** ../vim-8.2.3636/src/testdir/test_excmd.vim 2021-10-04 22:17:32.778131139 +0100 --- src/testdir/test_excmd.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 603,609 **** if has('clientserver') call assert_fails('let s=remote_expr("gvim", "2+2")', 'E48:') if !has('win32') ! " remote_foreground() doesn't thrown an error message on MS-Windows call assert_fails('call remote_foreground("gvim")', 'E48:') endif call assert_fails('let s=remote_peek("gvim")', 'E48:') --- 603,609 ---- if has('clientserver') call assert_fails('let s=remote_expr("gvim", "2+2")', 'E48:') if !has('win32') ! " remote_foreground() doesn't throw an error message on MS-Windows call assert_fails('call remote_foreground("gvim")', 'E48:') endif call assert_fails('let s=remote_peek("gvim")', 'E48:') *** ../vim-8.2.3636/src/testdir/test_flatten.vim 2021-02-01 19:14:44.566705066 +0000 --- src/testdir/test_flatten.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 54,60 **** call test_garbagecollect_now() call assert_equal([1, 2, 3], l:list) ! " Tests for checking circular reference list can be flatten. let l:x = [1] let l:y = [x] let l:z = flatten(l:y) --- 54,60 ---- call test_garbagecollect_now() call assert_equal([1, 2, 3], l:list) ! " Tests for checking circular reference list can be flattened. let l:x = [1] let l:y = [x] let l:z = flatten(l:y) *** ../vim-8.2.3636/src/testdir/test_ins_complete.vim 2021-11-20 19:13:35.945146370 +0000 --- src/testdir/test_ins_complete.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 50,56 **** " i-add-expands and switches to local exe "normal OM\\\\\\\\\" call assert_equal("Makefile\tto\trun3", getline('.')) ! " add-expands lines (it would end in an empty line if it didn't ignored " itself) exe "normal o\\\\\\" call assert_equal("Makefile\tto\trun3", getline('.')) --- 50,56 ---- " i-add-expands and switches to local exe "normal OM\\\\\\\\\" call assert_equal("Makefile\tto\trun3", getline('.')) ! " add-expands lines (it would end in an empty line if it didn't ignore " itself) exe "normal o\\\\\\" call assert_equal("Makefile\tto\trun3", getline('.')) *** ../vim-8.2.3636/src/testdir/test_normal.vim 2021-11-18 22:08:52.011682687 +0000 --- src/testdir/test_normal.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 1243,1249 **** norm! j call assert_equal('52', getline('.')) ! " zA on a opened fold when foldenable is not set 50 set nofoldenable norm! zA --- 1243,1249 ---- norm! j call assert_equal('52', getline('.')) ! " zA on an opened fold when foldenable is not set 50 set nofoldenable norm! zA *************** *** 1601,1607 **** let not_gnu_man = has('mac') || has('bsd') if not_gnu_man ! " In MacOS and BSD, the option for specifying a pager is different set keywordprg=man\ -P\ cat else set keywordprg=man\ --pager=cat --- 1601,1607 ---- let not_gnu_man = has('mac') || has('bsd') if not_gnu_man ! " In macOS and BSD, the option for specifying a pager is different set keywordprg=man\ -P\ cat else set keywordprg=man\ --pager=cat *************** *** 2394,2400 **** call assert_equal('foo first line', getline(1)) set virtualedit& ! " Test for aboring a g command using CTRL-\ CTRL-G exe "normal! g\\" call assert_equal('foo first line', getline('.')) --- 2394,2400 ---- call assert_equal('foo first line', getline(1)) set virtualedit& ! " Test for aborting a g command using CTRL-\ CTRL-G exe "normal! g\\" call assert_equal('foo first line', getline('.')) *** ../vim-8.2.3636/src/testdir/test_options.vim 2021-10-16 16:48:23.651196150 +0100 --- src/testdir/test_options.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 1154,1160 **** set cmdheight& endfunc ! " To specify a control character as a option value, '^' can be used func Test_opt_control_char() set wildchar=^v call assert_equal("\", nr2char(&wildchar)) --- 1154,1160 ---- set cmdheight& endfunc ! " To specify a control character as an option value, '^' can be used func Test_opt_control_char() set wildchar=^v call assert_equal("\", nr2char(&wildchar)) *** ../vim-8.2.3636/src/testdir/test_python2.vim 2021-05-24 14:15:41.779049851 +0100 --- src/testdir/test_python2.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 412,418 **** py d = vim.bindeval('d') call assert_equal(2, pyeval('len(d)')) ! " Deleting an non-existing key call AssertException(["py del d['c']"], "Vim(python):KeyError: 'c'") endfunc --- 412,418 ---- py d = vim.bindeval('d') call assert_equal(2, pyeval('len(d)')) ! " Deleting a non-existing key call AssertException(["py del d['c']"], "Vim(python):KeyError: 'c'") endfunc *** ../vim-8.2.3636/src/testdir/test_python3.vim 2021-11-16 13:08:53.338904944 +0000 --- src/testdir/test_python3.vim 2021-11-21 11:32:04.092927176 +0000 *************** *** 605,611 **** py3 d = vim.bindeval('d') call assert_equal(2, py3eval('len(d)')) ! " Deleting an non-existing key call AssertException(["py3 del d['c']"], "Vim(py3):KeyError: 'c'") endfunc --- 605,611 ---- py3 d = vim.bindeval('d') call assert_equal(2, py3eval('len(d)')) ! " Deleting a non-existing key call AssertException(["py3 del d['c']"], "Vim(py3):KeyError: 'c'") endfunc *** ../vim-8.2.3636/src/testdir/test_quickfix.vim 2021-10-20 21:58:37.239792741 +0100 --- src/testdir/test_quickfix.vim 2021-11-21 11:32:04.096927178 +0000 *************** *** 2865,2871 **** call writefile(['Editor:VIM vim', \ 'Editor:Emacs EmAcS', \ 'Editor:Notepad NOTEPAD'], 'Xtestfile1') ! call writefile(['Linux', 'MacOS', 'MS-Windows'], 'Xtestfile2') " Error cases call assert_fails('Xvimgrep /abc *', 'E682:') --- 2865,2871 ---- call writefile(['Editor:VIM vim', \ 'Editor:Emacs EmAcS', \ 'Editor:Notepad NOTEPAD'], 'Xtestfile1') ! call writefile(['Linux', 'macOS', 'MS-Windows'], 'Xtestfile2') " Error cases call assert_fails('Xvimgrep /abc *', 'E682:') *************** *** 2879,2885 **** Xexpr "" Xvimgrepadd Notepad Xtestfile1 ! Xvimgrepadd MacOS Xtestfile2 let l = g:Xgetlist() call assert_equal(2, len(l)) call assert_equal('Editor:Notepad NOTEPAD', l[0].text) --- 2879,2885 ---- Xexpr "" Xvimgrepadd Notepad Xtestfile1 ! Xvimgrepadd macOS Xtestfile2 let l = g:Xgetlist() call assert_equal(2, len(l)) call assert_equal('Editor:Notepad NOTEPAD', l[0].text) *************** *** 4126,4132 **** func Test_shorten_fname() CheckUnix %bwipe ! " Create a quickfix list with a absolute path filename let fname = getcwd() . '/test_quickfix.vim' call setqflist([], ' ', {'lines':[fname . ":20:Line20"], 'efm':'%f:%l:%m'}) call assert_equal(fname, bufname('test_quickfix.vim')) --- 4126,4132 ---- func Test_shorten_fname() CheckUnix %bwipe ! " Create a quickfix list with an absolute path filename let fname = getcwd() . '/test_quickfix.vim' call setqflist([], ' ', {'lines':[fname . ":20:Line20"], 'efm':'%f:%l:%m'}) call assert_equal(fname, bufname('test_quickfix.vim')) *************** *** 4135,4141 **** call assert_equal('test_quickfix.vim', bufname('test_quickfix.vim')) cclose %bwipe ! " Create a quickfix list with a absolute path filename call setqflist([], ' ', {'lines':[fname . ":20:Line20"], 'efm':'%f:%l:%m'}) call assert_equal(fname, bufname('test_quickfix.vim')) " Displaying the quickfix list should simplify the file path --- 4135,4141 ---- call assert_equal('test_quickfix.vim', bufname('test_quickfix.vim')) cclose %bwipe ! " Create a quickfix list with an absolute path filename call setqflist([], ' ', {'lines':[fname . ":20:Line20"], 'efm':'%f:%l:%m'}) call assert_equal(fname, bufname('test_quickfix.vim')) " Displaying the quickfix list should simplify the file path *** ../vim-8.2.3636/src/testdir/test_recover.vim 2021-10-11 20:50:13.006186380 +0100 --- src/testdir/test_recover.vim 2021-11-21 11:32:04.096927178 +0000 *************** *** 361,367 **** endfunc " Test for :recover using a unreadable swap file ! func Test_recover_unreadble_swap_file() CheckUnix CheckNotRoot new Xfile1 --- 361,367 ---- endfunc " Test for :recover using a unreadable swap file ! func Test_recover_unreadable_swap_file() CheckUnix CheckNotRoot new Xfile1 *** ../vim-8.2.3636/src/testdir/test_spellfile.vim 2021-08-14 20:11:47.500966948 +0100 --- src/testdir/test_spellfile.vim 2021-11-21 11:32:04.096927178 +0000 *************** *** 702,708 **** let output = execute('mkspell! Xtest.spl Xtest') call assert_match('Different combining flag in continued affix block in Xtest.aff line 3', output) ! " Try to reuse a affix used for BAD flag call writefile(['BAD x', 'PFX x Y 1', 'PFX x 0 re x'], 'Xtest.aff') let output = execute('mkspell! Xtest.spl Xtest') call assert_match('Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in Xtest.aff line 2: x', output) --- 702,708 ---- let output = execute('mkspell! Xtest.spl Xtest') call assert_match('Different combining flag in continued affix block in Xtest.aff line 3', output) ! " Try to reuse an affix used for BAD flag call writefile(['BAD x', 'PFX x Y 1', 'PFX x 0 re x'], 'Xtest.aff') let output = execute('mkspell! Xtest.spl Xtest') call assert_match('Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in Xtest.aff line 2: x', output) *** ../vim-8.2.3636/src/testdir/test_syntax.vim 2021-05-06 16:36:50.988003911 +0100 --- src/testdir/test_syntax.vim 2021-11-21 11:32:04.096927178 +0000 *************** *** 502,509 **** func Test_bg_detection() CheckNotGui ! " auto-detection of &bg, make sure sure it isn't set anywhere before ! " this test hi Normal ctermbg=0 call assert_equal('dark', &bg) hi Normal ctermbg=4 --- 502,508 ---- func Test_bg_detection() CheckNotGui ! " auto-detection of &bg, make sure it isn't set anywhere before this test hi Normal ctermbg=0 call assert_equal('dark', &bg) hi Normal ctermbg=4 *** ../vim-8.2.3636/src/testdir/test_termcodes.vim 2021-07-30 20:17:59.142134917 +0100 --- src/testdir/test_termcodes.vim 2021-11-21 11:32:04.096927178 +0000 *************** *** 314,321 **** call setline(1, ['123456789', '123456789']) let @* = 'abc' ! " Middle-click in inesrt mode doesn't move the cursor but inserts the ! " contents of aregister call cursor(1, 4) call feedkeys('i' .. \ MouseMiddleClickCode(2, 7) .. MouseMiddleReleaseCode(2, 7) .. --- 314,321 ---- call setline(1, ['123456789', '123456789']) let @* = 'abc' ! " Middle-click in insert mode doesn't move the cursor but inserts the ! " contents of a register call cursor(1, 4) call feedkeys('i' .. \ MouseMiddleClickCode(2, 7) .. MouseMiddleReleaseCode(2, 7) .. *************** *** 365,371 **** close! endfunc ! " Test for using the mouse to increaes the height of the cmdline window func Test_mouse_cmdwin_resize() CheckFeature cmdwin --- 365,371 ---- close! endfunc ! " Test for using the mouse to increase the height of the cmdline window func Test_mouse_cmdwin_resize() CheckFeature cmdwin *** ../vim-8.2.3636/src/testdir/test_textobjects.vim 2021-09-03 15:50:11.967606130 +0100 --- src/testdir/test_textobjects.vim 2021-11-21 11:32:04.096927178 +0000 *************** *** 205,211 **** normal 0f\d\+_ImpFunc\[1\]..\d\+_ExpFunc, line 1', v:throwpoint) endtry --- 2149,2155 ---- try source Ximport.vim catch /E1001/ ! # Error should be before the Xexported.vim file. assert_match('E1001: Variable not found: notDefined', v:exception) assert_match('function \d\+_ImpFunc\[1\]..\d\+_ExpFunc, line 1', v:throwpoint) endtry *************** *** 4579,4585 **** Nested() enddef ! " Execute this near the end, profiling doesn't stop until Vim exists. " This only tests that it works, not the profiling output. def Test_xx_profile_with_lambda() CheckFeature profile --- 4579,4585 ---- Nested() enddef ! " Execute this near the end, profiling doesn't stop until Vim exits. " This only tests that it works, not the profiling output. def Test_xx_profile_with_lambda() CheckFeature profile *** ../vim-8.2.3636/src/testdir/test_viminfo.vim 2021-06-21 17:43:46.136307978 +0100 --- src/testdir/test_viminfo.vim 2021-11-21 11:32:04.096927178 +0000 *************** *** 635,646 **** call test_settime(35) edit again call test_settime(40) ! edit fourty wviminfo Xviminfo sp Xviminfo 1 ! for name in ['fourty', 'again', 'thirty', 'twenty', 'ten'] /^> call assert_equal(name, substitute(getline('.'), '.*/', '', '')) endfor --- 635,646 ---- call test_settime(35) edit again call test_settime(40) ! edit forty wviminfo Xviminfo sp Xviminfo 1 ! for name in ['forty', 'again', 'thirty', 'twenty', 'ten'] /^> call assert_equal(name, substitute(getline('.'), '.*/', '', '')) endfor *************** *** 950,956 **** let &viminfofile = save_vif endfunc ! " Test for an unwritable and unreadble 'viminfo' file func Test_viminfo_perm() CheckUnix CheckNotRoot --- 950,956 ---- let &viminfofile = save_vif endfunc ! " Test for an unwritable and unreadable 'viminfo' file func Test_viminfo_perm() CheckUnix CheckNotRoot *** ../vim-8.2.3636/src/version.c 2021-11-21 11:15:45.662752634 +0000 --- src/version.c 2021-11-21 11:33:18.416960122 +0000 *************** *** 759,760 **** --- 759,762 ---- { /* Add new patch number below this line */ + /**/ + 3637, /**/ -- Lose weight, NEVER Diet again with The "Invisible Weight Loss Patch" (spam e-mail) /// 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 ///