summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-16 21:02:28 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-16 21:02:28 +0100
commit27f4f6baeeb25e1597a7827f4a509ecf2eb8e6e2 (patch)
treef8354ddd5a67c55329f15a68b09ad37e268f415b
parent8adc8d9b73121b647476a33d91d31d25e1c2d987 (diff)
patch 8.2.1998: terminal Cmd test sometimes fails to close popupv8.2.1998
Problem: Terminal Cmd test sometimes fails to close popup. Solution: Add "term_finish" option.
-rw-r--r--src/testdir/test_terminal.vim5
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 735164780c..846ec5986e 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 0e9973e097..186bbdea63 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 */
/**/
+ 1998,
+/**/
1997,
/**/
1996,