From 17ab28daa060c3c263841329e74befb9c6e8b588 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 18 Nov 2020 12:24:01 +0100
Subject: [PATCH] patch 8.2.2007: test for insert mode in popup is not reliable

Problem:    Test for insert mode in popup is not reliable.
Solution:   Wait for the popup to disappear. (Ozaki Kiichi, closes #7321)
---
 src/testdir/test_terminal.vim | 2 +-
 src/version.c                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index ee0e74344..cef379a57 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1266,7 +1266,7 @@ func Test_terminal_popup_insert_cmd()
   call assert_equal('n', mode())
 
   call feedkeys("\<C-D>", 'xt')
-  sleep 50m
+  call WaitFor({-> popup_list() == []})
   delfunc StartTermInPopup
   iunmap <F3>
 endfunc
diff --git a/src/version.c b/src/version.c
index 4b91ba453..cc296f5d6 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 */
+/**/
+    2007,
 /**/
     2006,
 /**/
-- 
2.50.1