diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-07 17:03:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-07 17:03:21 +0200 |
| commit | 4fdb8bd0546ac8d90560a4fad359a48667089d43 (patch) | |
| tree | bde13c6aa49038159891ff1854a06f012842c062 /src | |
| parent | 5b157fe2edfdce5f77080aeac2b4a03f39eb1c1a (diff) | |
patch 8.2.0921: CTRL-W T in cmdline window causes troublev8.2.0921
Problem: CTRL-W T in cmdline window causes trouble.
Solution: Disallow CTRL-W T in the cmdline window. Add more tests.
(Naruhiko Nishino, closes #6219)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_cmdline.vim | 21 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/window.c | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index b5e316cf1c..94cb8273dc 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1503,6 +1503,27 @@ func Test_cmdwin_blocked_commands() call assert_fails('call feedkeys("q:Q\<CR>", "xt")', 'E11:') call assert_fails('call feedkeys("q:Z\<CR>", "xt")', 'E11:') call assert_fails('call feedkeys("q:\<F1>\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>s", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>v", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>^", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>n", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>z", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>o", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>w", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>j", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>k", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>h", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>l", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>T", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>x", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>r", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>R", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>K", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>}", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>]", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>f", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>d", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>g", "xt")', 'E11:') endfunc " Close the Cmd-line window in insert mode using CTRL-C diff --git a/src/version.c b/src/version.c index c400df423f..ec6117ffe5 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 921, +/**/ 920, /**/ 919, diff --git a/src/window.c b/src/window.c index 931d86bdf6..095eabed2b 100644 --- a/src/window.c +++ b/src/window.c @@ -340,6 +340,7 @@ newwindow: // move window to new tab page case 'T': + CHECK_CMDWIN; if (one_window()) msg(_(m_onlyone)); else |