Patch 9.0.0663

4 views
Skip to first unread message

Bram Moolenaar

unread,
Oct 5, 2022, 6:25:25 AM10/5/22
to vim...@googlegroups.com

Patch 9.0.0663
Problem: Tests check for +cmdwin feature which is always present.
Solution: Remove the checks. (closes #11287)
Files: src/testdir/test_arglist.vim, src/testdir/test_autocmd.vim,
src/testdir/test_cmdwin.vim, src/testdir/test_tabpage.vim,
src/testdir/test_termcodes.vim, src/testdir/test_window_cmd.vim


*** ../vim-9.0.0662/src/testdir/test_arglist.vim 2022-09-09 11:27:55.102727637 +0100
--- src/testdir/test_arglist.vim 2022-10-05 11:21:51.084953304 +0100
***************
*** 587,594 ****

" Test for ":all" not working when in the cmdline window
func Test_all_not_allowed_from_cmdwin()
- CheckFeature cmdwin
-
au BufEnter * all
next x
" Use try/catch here, somehow assert_fails() doesn't work on MS-Windows
--- 587,592 ----
*** ../vim-9.0.0662/src/testdir/test_autocmd.vim 2022-09-28 11:48:26.677156955 +0100
--- src/testdir/test_autocmd.vim 2022-10-05 11:21:51.084953304 +0100
***************
*** 2778,2784 ****

func Test_autocmd_CmdWinEnter()
CheckRunVimInTerminal
- CheckFeature cmdwin

let lines =<< trim END
augroup vimHints | au! | augroup END
--- 2778,2783 ----
***************
*** 3418,3436 ****
call assert_equal(5, g:nori_to_any)
endif

! if has('cmdwin')
! let g:n_to_c = 0
! au ModeChanged n:c let g:n_to_c += 1
! let g:c_to_n = 0
! au ModeChanged c:n let g:c_to_n += 1
! let g:mode_seq += ['c', 'n', 'c', 'n']
! call feedkeys("q:\<C-C>\<Esc>", 'tnix')
! call assert_equal(len(g:mode_seq) - 1, g:index)
! call assert_equal(2, g:n_to_c)
! call assert_equal(2, g:c_to_n)
! unlet g:n_to_c
! unlet g:c_to_n
! endif

au! ModeChanged
delfunc TestMode
--- 3417,3433 ----
call assert_equal(5, g:nori_to_any)
endif

! let g:n_to_c = 0
! au ModeChanged n:c let g:n_to_c += 1
! let g:c_to_n = 0
! au ModeChanged c:n let g:c_to_n += 1
! let g:mode_seq += ['c', 'n', 'c', 'n']
! call feedkeys("q:\<C-C>\<Esc>", 'tnix')
! call assert_equal(len(g:mode_seq) - 1, g:index)
! call assert_equal(2, g:n_to_c)
! call assert_equal(2, g:c_to_n)
! unlet g:n_to_c
! unlet g:c_to_n

au! ModeChanged
delfunc TestMode
*** ../vim-9.0.0662/src/testdir/test_cmdwin.vim 2022-09-26 23:08:17.444945122 +0100
--- src/testdir/test_cmdwin.vim 2022-10-05 11:21:51.084953304 +0100
***************
*** 1,8 ****
" Tests for editing the command line.

source check.vim
- CheckFeature cmdwin
-
source screendump.vim

func Test_getcmdwintype()
--- 1,6 ----
*** ../vim-9.0.0662/src/testdir/test_tabpage.vim 2022-09-02 21:55:45.507049444 +0100
--- src/testdir/test_tabpage.vim 2022-10-05 11:21:51.084953304 +0100
***************
*** 617,624 ****

" Test for closing the tab page from a command window
func Test_tabpage_close_cmdwin()
- CheckFeature cmdwin
-
tabnew
call feedkeys("q/:tabclose\<CR>\<Esc>", 'xt')
call assert_equal(2, tabpagenr('$'))
--- 617,622 ----
*** ../vim-9.0.0662/src/testdir/test_termcodes.vim 2022-08-26 12:26:04.546865218 +0100
--- src/testdir/test_termcodes.vim 2022-10-05 11:21:51.084953304 +0100
***************
*** 367,374 ****

" Test for using the mouse to increase the height of the cmdline window
func Test_mouse_cmdwin_resize()
- CheckFeature cmdwin
-
let save_mouse = &mouse
let save_term = &term
let save_ttymouse = &ttymouse
--- 367,372 ----
*** ../vim-9.0.0662/src/testdir/test_window_cmd.vim 2022-10-03 15:27:30.066072111 +0100
--- src/testdir/test_window_cmd.vim 2022-10-05 11:21:51.084953304 +0100
***************
*** 20,27 ****
endfunc

func Test_window_cmd_cmdwin_with_vsp()
- CheckFeature cmdwin
-
let efmt = 'Expected 0 but got %d (in ls=%d, %s window)'
for v in range(0, 2)
exec "set ls=" . v
--- 20,25 ----
*** ../vim-9.0.0662/src/version.c 2022-10-04 22:40:34.032508860 +0100
--- src/version.c 2022-10-05 11:23:14.788716720 +0100
***************
*** 701,702 ****
--- 701,704 ----
{ /* Add new patch number below this line */
+ /**/
+ 663,
/**/

--
In his lifetime van Gogh painted 486 oil paintings. Oddly enough, 8975
of them are to be found in the United States.

/// Bram Moolenaar -- Br...@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 ///
Reply all
Reply to author
Forward
0 new messages