From 4c5bdb99ad632d703e94fffafba11b91861fea48 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 17 Dec 2020 17:45:59 +0100
Subject: [PATCH] patch 8.2.2149: popupwin test for latin1 sometimes fails

Problem:    Popupwin test for latin1 sometimes fails.
Solution:   Wait for the script to finish.
---
 src/testdir/test_popupwin.vim | 3 +++
 src/version.c                 | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index cf9536f5e1..32a1eb7e80 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3721,11 +3721,14 @@ func Test_popupwin_latin1_encoding()
       set encoding=latin1
       terminal cat Xmultibyte
       call popup_create(['one', 'two', 'three', 'four'], #{line: 1, col: 10})
+      redraw
+      echo "Done"
   END
   call writefile(lines, 'XtestPopupLatin')
   call writefile([repeat("\u3042 ", 120)], 'Xmultibyte')
 
   let buf = RunVimInTerminal('-S XtestPopupLatin', #{rows: 10})
+  call WaitForAssert({-> assert_match('Done', term_getline(buf, 10))})
 
   call term_sendkeys(buf, ":q\<CR>")
   call StopVimInTerminal(buf)
diff --git a/src/version.c b/src/version.c
index a5c7127dc2..95633c8f27 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2149,
 /**/
     2148,
 /**/