From 27f4f6baeeb25e1597a7827f4a509ecf2eb8e6e2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 16 Nov 2020 21:02:28 +0100
Subject: [PATCH] patch 8.2.1998: terminal Cmd test sometimes fails to close
 popup

Problem:    Terminal Cmd test sometimes fails to close popup.
Solution:   Add "term_finish" option.
---
 src/testdir/test_terminal.vim | 5 ++---
 src/version.c                 | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 735164780..846ec5986 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1259,15 +1259,14 @@ func Test_terminal_popup_insert_cmd()
 
   inoremap <F3> <Cmd>call StartTermInPopup()<CR>
   func StartTermInPopup()
-    call term_start(['/bin/sh', '-c', 'cat'], #{hidden: v:true})->popup_create(#{highlight: 'Pmenu'})
+    call term_start(['/bin/sh', '-c', 'cat'], #{hidden: v:true, term_finish: 'close'})->popup_create(#{highlight: 'Pmenu'})
   endfunc
   call feedkeys("i\<F3>")
   sleep 10m
   call assert_equal('n', mode())
 
   call feedkeys("\<C-D>", 'xt')
-  sleep 20m
-  call feedkeys(":q\<CR>", 'xt')
+  sleep 50m
   delfunc StartTermInPopup
   iunmap <F3>
 endfunc
diff --git a/src/version.c b/src/version.c
index 0e9973e09..186bbdea6 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 */
+/**/
+    1998,
 /**/
     1997,
 /**/
-- 
2.40.0