diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-06 11:54:35 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-06 11:54:35 +0100 |
| commit | 1af5ce01c333ed8be57f15dd7ba7846ac4760810 (patch) | |
| tree | 9abbf58a5cae5093c90b25a9f75d81d720b87800 | |
| parent | 4af11174f71f80b8966de2d9950200c574dac820 (diff) | |
| download | vim-git-1af5ce01c333ed8be57f15dd7ba7846ac4760810.tar.gz | |
patch 8.2.0220: terminal test did pass on Macv8.2.0220
Problem: Terminal test did pass on Mac.
Solution: Remove the skip again.
| -rw-r--r-- | src/testdir/test_terminal.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |