changeset 20747:32f24b8c9c2d v8.2.0926

patch 8.2.0926: cmdline test fails on Appveyor Commit: https://github.com/vim/vim/commit/951a2fb1b87af7e3be81e85a3769a17a13fd5040 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 7 19:38:10 2020 +0200 patch 8.2.0926: cmdline test fails on Appveyor Problem: Cmdline test fails on Appveyor. Solution: Add CR to the commands. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/6220)
author Bram Moolenaar <Bram@vim.org>
date Sun, 07 Jun 2020 19:45:03 +0200
parents 80469f93b621
children 791277e2f6be
files src/testdir/test_cmdline.vim src/version.c
diffstat 2 files changed, 23 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,