summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-10-05 11:24:46 +0100
committerBram Moolenaar <Bram@vim.org>2022-10-05 11:24:46 +0100
commitd1955987147a299d7bca30cd1b5792535ff0745c (patch)
tree3c91f4e3d131baeeb744a2623c2a850ed226cfd6
parent75008661821eee6989476908feaf64a9dea03e05 (diff)
patch 9.0.0663: tests check for +cmdwin feature which is always presentv9.0.0663
Problem: Tests check for +cmdwin feature which is always present. Solution: Remove the checks. (closes #11287)
-rw-r--r--src/testdir/test_arglist.vim2
-rw-r--r--src/testdir/test_autocmd.vim25
-rw-r--r--src/testdir/test_cmdwin.vim2
-rw-r--r--src/testdir/test_tabpage.vim2
-rw-r--r--src/testdir/test_termcodes.vim2
-rw-r--r--src/testdir/test_window_cmd.vim2
-rw-r--r--src/version.c2
7 files changed, 13 insertions, 24 deletions
diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim
index 298514ef09..1bc556fa91 100644
--- a/src/testdir/test_arglist.vim
+++ b/src/testdir/test_arglist.vim
@@ -587,8 +587,6 @@ endfunc
" 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
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 70f0f553a2..3698fd57ee 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2778,7 +2778,6 @@ endfunc
func Test_autocmd_CmdWinEnter()
CheckRunVimInTerminal
- CheckFeature cmdwin
let lines =<< trim END
augroup vimHints | au! | augroup END
@@ -3418,19 +3417,17 @@ func Test_mode_changes()
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
+ 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
diff --git a/src/testdir/test_cmdwin.vim b/src/testdir/test_cmdwin.vim
index dc6889495f..ad05f3e044 100644
--- a/src/testdir/test_cmdwin.vim
+++ b/src/testdir/test_cmdwin.vim
@@ -1,8 +1,6 @@
" Tests for editing the command line.
source check.vim
-CheckFeature cmdwin
-
source screendump.vim
func Test_getcmdwintype()
diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim
index fe97578b10..ef265edfb9 100644
--- a/src/testdir/test_tabpage.vim
+++ b/src/testdir/test_tabpage.vim
@@ -617,8 +617,6 @@ endfunc
" 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('$'))
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 578c97018a..cb1d01a0b3 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -367,8 +367,6 @@ endfunc
" 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
diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim
index 017fa67448..771875757d 100644
--- a/src/testdir/test_window_cmd.vim
+++ b/src/testdir/test_window_cmd.vim
@@ -20,8 +20,6 @@ func Test_window_cmd_ls0_with_split()
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
diff --git a/src/version.c b/src/version.c
index 540ea3713a..61f2fd23bc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 663,
+/**/
662,
/**/
661,