summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-12-06 09:11:39 +0000
committerBram Moolenaar <Bram@vim.org>2022-12-06 09:11:39 +0000
commit7155fb6614f45a4e573bbfca23b5d150604ad506 (patch)
tree1bae842cef709ae35a5a84b307c8f64c9eb6f024 /src
parent9dacdb1d56ee0f9272f3fc956a12f15f84ffb205 (diff)
downloadvim-git-7155fb6614f45a4e573bbfca23b5d150604ad506.tar.gz
patch 9.0.1018: suspend test still fails on Mac OSv9.0.1018
Problem: Suspend test still fails on Mac OS. Solution: Make 'keyprotocol' empty.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_suspend.vim12
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index ab1a09161..ef8fea53e 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -22,9 +22,9 @@ func Test_suspend()
CheckFeature terminal
CheckExecutable /bin/sh
- " Somehow the modifyOtherKeys response may get to the terminal when using Mac
- " OS. Make t_RK empty to avoid that.
- set t_RK=
+ " Somehow the modifyOtherKeys response may get to the terminal when using
+ " Mac OS. Make t_RK and 'keyprotocol' empty to avoid that.
+ set t_RK= keyprotocol=
call WaitForResponses()
@@ -72,9 +72,9 @@ func Test_suspend_autocmd()
CheckFeature terminal
CheckExecutable /bin/sh
- " Somehow the modifyOtherKeys response may get to the terminal when using Mac
- " OS. Make t_RK empty to avoid that.
- set t_RK=
+ " Somehow the modifyOtherKeys response may get to the terminal when using
+ " Mac OS. Make t_RK and 'keyprotocol' empty to avoid that.
+ set t_RK= keyprotocol=
call WaitForResponses()
diff --git a/src/version.c b/src/version.c
index 4ba888e0f..eb34e006e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1018,
+/**/
1017,
/**/
1016,