patch 8.2.0220: terminal test did pass on Mac

Problem:    Terminal test did pass on Mac.
Solution:   Remove the skip again.

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index ae762fe670c9d8a63d53c207d124f9a5df86db18..605ac06fa8693b847ab74fa1f3c8d356a202992d 100644 (file)
--- 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 e1c4a5e3fda99d18e262fe1c49bf1d5fdafac1ac..74f38b15ee5b6ca48b9bb7ab5a90e4af96dfa45c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    220,
 /**/
     219,
 /**/