summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-02-16 17:04:09 +0100
committerBram Moolenaar <Bram@vim.org>2020-02-16 17:04:09 +0100
commita28be85ccde03ee0a0dc984dfd7396c50713b593 (patch)
tree4e549686f764eb1b331231ee8b16d5d81e10fae2
parenta76b31542e1d83b7d2fe7378439912e800a4d0f6 (diff)
downloadvim-git-a28be85ccde03ee0a0dc984dfd7396c50713b593.tar.gz
patch 8.2.0266: terminal in popup test sometimes fails on Macv8.2.0266
Problem: Terminal in popup test sometimes fails on Mac. Solution: Add a short delay.
-rw-r--r--src/testdir/test_terminal.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 5259454c8..e0761c4bd 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -2353,6 +2353,7 @@ func Test_terminal_in_popup()
\ ]
call writefile(lines, 'XtermPopup')
let buf = RunVimInTerminal('-S XtermPopup', #{rows: 15})
+ call term_wait(buf, 100)
call term_sendkeys(buf, ":\<CR>")
call VerifyScreenDump(buf, 'Test_terminal_popup_1', {})
diff --git a/src/version.c b/src/version.c
index da0b2f61c..67e23d52c 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 */
/**/
+ 266,
+/**/
265,
/**/
264,