summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-12 18:12:51 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-12 18:12:51 +0200
commit8ccabf624ef4eb7ebe3e4d52449bc0bc545810f2 (patch)
treeae0a5a7408c6e4fcc6c98f1fbbca0210922c8ee0
parent8071cb2c646c9d38dcd4e3ccd377dce07705f031 (diff)
downloadvim-git-8ccabf624ef4eb7ebe3e4d52449bc0bc545810f2.tar.gz
patch 8.1.1668: popup window test is a bit flaky on some systemsv8.1.1668
Problem: Popup window test is a bit flaky on some systems. Solution: Clear the command line. (Naruhiko Nishino, closes #4656)
-rw-r--r--src/testdir/test_popupwin.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 1a39d284f..7b7b1bd75 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -525,6 +525,9 @@ func Test_popup_select()
call term_sendkeys(buf, ":call popup_close(winid)\<CR>")
call term_sendkeys(buf, "\"*p")
+ " clean the command line, sometimes it still shows a command
+ call term_sendkeys(buf, ":\<esc>")
+
call VerifyScreenDump(buf, 'Test_popupwin_select_02', {})
" clean up
diff --git a/src/version.c b/src/version.c
index afd775a71..a2137ccae 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1668,
+/**/
1667,
/**/
1666,