summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-16 17:31:15 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-16 17:31:15 +0200
commit78d629a38548115a68298081d39d6d90708af561 (patch)
treec8791b8274ae420df4317fc45ef3e4294137c007
parent9a2fddcf04192a643dc97601d689c27f5bc5184f (diff)
downloadvim-git-78d629a38548115a68298081d39d6d90708af561.tar.gz
patch 8.1.1856: popup preview test fails sometimesv8.1.1856
Problem: popup preview test fails sometimes. (Christian Brabandt) Solution: Clear the command line.
-rw-r--r--src/testdir/dumps/Test_popupwin_previewpopup_6.dump2
-rw-r--r--src/testdir/test_popupwin.vim1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/dumps/Test_popupwin_previewpopup_6.dump b/src/testdir/dumps/Test_popupwin_previewpopup_6.dump
index cd160d3e4..a9a2be4c4 100644
--- a/src/testdir/dumps/Test_popupwin_previewpopup_6.dump
+++ b/src/testdir/dumps/Test_popupwin_previewpopup_6.dump
@@ -11,4 +11,4 @@
|v|e|r|y| |l|o|n|g| |l|i|n|e| |w|h|e|r|e| |t|h|e| |w|o|r|d| |i|s| |a|l|s|o| >a|n|o|t|h|e|r| @29
|~+0#4040ff13&| @73
|~| @73
-|:+0#0000000&|p|c|l|o|s|e| @49|1@1|,|3|9| @8|A|l@1|
+| +0#0000000&@56|1@1|,|3|9| @8|A|l@1|
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 26ab870a4..2c055f050 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2173,6 +2173,7 @@ func Test_previewpopup()
call term_sendkeys(buf, ":cd testdir\<CR>")
call term_sendkeys(buf, ":pclose\<CR>")
+ call term_sendkeys(buf, ":\<BS>")
call VerifyScreenDump(buf, 'Test_popupwin_previewpopup_6', {})
call term_sendkeys(buf, ":pedit +/theword Xtagfile\<CR>")
diff --git a/src/version.c b/src/version.c
index 28fd2a73a..f7be01295 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1856,
+/**/
1855,
/**/
1854,