summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-17 21:56:09 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-17 21:56:09 +0100
commitb125b535bb0456ab43c10683307a4bc359442d44 (patch)
tree71d079a62d59518f9fa2530d47a16daf1e2e7c5b
parent8dd46e72cfb13b8de793c808ee009c45e881903a (diff)
downloadvim-git-b125b535bb0456ab43c10683307a4bc359442d44.tar.gz
patch 8.2.2153: popupwin test for latin1 still fails sometimesv8.2.2153
Problem: Popupwin test for latin1 still fails sometimes. Solution: Wait for the "cat" command to finish.
-rw-r--r--src/testdir/test_popupwin.vim4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 32a1eb7e8..ca7c6a917 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3722,6 +3722,10 @@ func Test_popupwin_latin1_encoding()
terminal cat Xmultibyte
call popup_create(['one', 'two', 'three', 'four'], #{line: 1, col: 10})
redraw
+ " wait for "cat" to finish
+ while execute('ls!') !~ 'finished'
+ sleep 10m
+ endwhile
echo "Done"
END
call writefile(lines, 'XtestPopupLatin')
diff --git a/src/version.c b/src/version.c
index 3e6451843..2bb336e0b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2153,
+/**/
2152,
/**/
2151,