summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-09 21:44:03 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-09 21:44:03 +0100
commit31eb139b8877439d06db0ca57692dfe35fec3f0c (patch)
tree9ce7f92ecead797bd9e142a6b82f6555428dbfb5
parent399c297aa93afe2c0a39e2a1b3f972aebba44c9d (diff)
patch 8.0.0323: one second pause when running cmdline testv8.0.0323
Problem: When running the command line tests there is a one second wait. Solution: Change an Esc to Ctrl-C. (Yegappan Lakshmanan)
-rw-r--r--src/testdir/test_cmdline.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 0a5c91009c..b2beb689b1 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -353,7 +353,7 @@ func Test_getcmdtype()
call feedkeys("?MyCmd a\<C-R>=Check_cmdline('?')\<CR>\<Esc>", "xt")
call feedkeys(":call input('Answer?')\<CR>", "t")
- call feedkeys("MyCmd a\<C-R>=Check_cmdline('@')\<CR>\<Esc>", "xt")
+ call feedkeys("MyCmd a\<C-R>=Check_cmdline('@')\<CR>\<C-C>", "xt")
call feedkeys(":insert\<CR>MyCmd a\<C-R>=Check_cmdline('-')\<CR>\<Esc>", "xt")
diff --git a/src/version.c b/src/version.c
index c1a5186bac..a6dbe99462 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 323,
+/**/
322,
/**/
321,