summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-28 22:38:07 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-28 22:38:07 +0200
commit57441d6fa0ba44be8dc16d6469a8659afc2f3b81 (patch)
tree3d72862af6041937774d7b563a11e5744aa903cd
parentbc2d4c1db6d47f6d04412bb5f94b52e444faebc8 (diff)
patch 8.1.1935: test for text property popup window is flakyv8.1.1935
Problem: Test for text property popup window is flaky. Solution: Remove the undo message
-rw-r--r--src/testdir/dumps/Test_popup_textprop_corn_4.dump2
-rw-r--r--src/testdir/test_popupwin_textprop.vim1
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/dumps/Test_popup_textprop_corn_4.dump b/src/testdir/dumps/Test_popup_textprop_corn_4.dump
index 7bf10b24b4..6db9eee8c0 100644
--- a/src/testdir/dumps/Test_popup_textprop_corn_4.dump
+++ b/src/testdir/dumps/Test_popup_textprop_corn_4.dump
@@ -9,4 +9,4 @@
|5|3| @21|╚+0#0000001#ffd7ff255|═@9|╝| +0#0000000#ffffff0@38
|5|4| @72
|5@1| @72
-|1| |l|i|n|e| |l|e|s@1|;| |b|e|f|o|r|e| |#|3| @1|1| |s|e|c|o|n|d| |a|g|o| @20|4|6|,|1| @9|4|9|%|
+|:| @55|4|6|,|1| @9|4|9|%|
diff --git a/src/testdir/test_popupwin_textprop.vim b/src/testdir/test_popupwin_textprop.vim
index 491381592d..2a4eb2cd0d 100644
--- a/src/testdir/test_popupwin_textprop.vim
+++ b/src/testdir/test_popupwin_textprop.vim
@@ -96,6 +96,7 @@ func Test_textprop_popup_corners()
call VerifyScreenDump(buf, 'Test_popup_textprop_corn_3', {})
call term_sendkeys(buf, "u")
+ call term_sendkeys(buf, ":\<CR>")
call VerifyScreenDump(buf, 'Test_popup_textprop_corn_4', {})
" clean up
diff --git a/src/version.c b/src/version.c
index 966c5b76c6..f798b8f4ba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1935,
+/**/
1934,
/**/
1933,