From e6329e4c55cd81b6134820eab6a10b02c11c1277 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 16 Nov 2020 21:10:34 +0100
Subject: [PATCH] patch 8.2.1999: terminal popup test sometimes fails

Problem:    Terminal popup test sometimes fails.
Solution:   Wait for the popup to close.
---
 src/testdir/test_terminal.vim | 4 ++--
 src/version.c                 | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 846ec5986e..ee0e743440 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1249,8 +1249,8 @@ func Test_terminal_popup_bufload()
   " must not have switched to another window
   call assert_equal(winid, win_getid())
 
-  call feedkeys("exit\<CR>", 'xt')
-  sleep 50m
+  call StopShellInTerminal(termbuf)
+  call WaitFor({-> win_getid() != winid})
   exe 'bwipe! ' .. newbuf
 endfunc
 
diff --git a/src/version.c b/src/version.c
index 186bbdea63..ec1abe6885 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 */
+/**/
+    1999,
 /**/
     1998,
 /**/