summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_terminal.vim10
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index ae762fe67..605ac06fa 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2359,12 +2359,10 @@ func Test_terminal_in_popup()
call term_sendkeys(buf, "/edit\<CR>")
call VerifyScreenDump(buf, 'Test_terminal_popup_3', {})
- " TODO: somehow this causes the job to keep running on Mac
- if !has('mac')
- call term_sendkeys(buf, "\<C-W>:call HidePopup()\<CR>")
- call VerifyScreenDump(buf, 'Test_terminal_popup_4', {})
- call term_sendkeys(buf, "\<CR>")
- endif
+ call term_sendkeys(buf, "\<C-W>:call HidePopup()\<CR>")
+ call VerifyScreenDump(buf, 'Test_terminal_popup_4', {})
+ call term_sendkeys(buf, "\<CR>")
+ call term_wait(buf, 50)
call term_sendkeys(buf, ":q\<CR>")
call term_wait(buf, 100) " wait for terminal to vanish
diff --git a/src/version.c b/src/version.c
index e1c4a5e3f..74f38b15e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 220,
+/**/
219,
/**/
218,