diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-07 19:38:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-07 19:38:10 +0200 |
| commit | 951a2fb1b87af7e3be81e85a3769a17a13fd5040 (patch) | |
| tree | 78abf7a68ddaa6185619291731d64c5bd24e43d3 | |
| parent | 1f1fd44ef796dd909ff5f3e5288b3fd79294dc71 (diff) | |
| download | vim-git-951a2fb1b87af7e3be81e85a3769a17a13fd5040.tar.gz | |
patch 8.2.0926: cmdline test fails on Appveyorv8.2.0926
Problem: Cmdline test fails on Appveyor.
Solution: Add CR to the commands. (Naruhiko Nishino, closes #6220)
| -rw-r--r-- | src/testdir/test_cmdline.vim | 42 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 23 insertions, 21 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 1d3f27562..e7752cca9 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1517,27 +1517,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:') + call assert_fails('call feedkeys("q:\<C-W>s\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>v\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>^\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>n\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>z\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>o\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>w\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>j\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>k\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>h\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>l\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>T\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>x\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>r\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>R\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>K\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>}\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>]\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>f\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>d\<CR>", "xt")', 'E11:') + call assert_fails('call feedkeys("q:\<C-W>g\<CR>", "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 bfe94cf85..448249132 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 */ /**/ + 926, +/**/ 925, /**/ 924, |