From: Bram Moolenaar Date: Fri, 16 Aug 2019 15:31:15 +0000 (+0200) Subject: patch 8.1.1856: popup preview test fails sometimes X-Git-Tag: v8.1.1856 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78d629a38548115a68298081d39d6d90708af561;p=thirdparty%2Fvim.git patch 8.1.1856: popup preview test fails sometimes Problem: popup preview test fails sometimes. (Christian Brabandt) Solution: Clear the command line. --- diff --git a/src/testdir/dumps/Test_popupwin_previewpopup_6.dump b/src/testdir/dumps/Test_popupwin_previewpopup_6.dump index cd160d3e48..a9a2be4c4e 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 26ab870a4c..2c055f0501 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\") call term_sendkeys(buf, ":pclose\") + call term_sendkeys(buf, ":\") call VerifyScreenDump(buf, 'Test_popupwin_previewpopup_6', {}) call term_sendkeys(buf, ":pedit +/theword Xtagfile\") diff --git a/src/version.c b/src/version.c index 28fd2a73a8..f7be012951 100644 --- a/src/version.c +++ b/src/version.c @@ -769,6 +769,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1856, /**/ 1855, /**/