summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-12-06 16:09:52 +0000
committerBram Moolenaar <Bram@vim.org>2022-12-06 16:09:52 +0000
commitaf34543b926a8704c3346d41e57a219baa5ca61c (patch)
tree8e9158b7bc8edd906499ae01da82dd1c82ad71be
parentd6e74f547910d5273a3b99c23fb3197131c7d379 (diff)
downloadvim-git-9.0.1022.tar.gz
patch 9.0.1022: suspend test fails on Mac OS when suspending Vimv9.0.1022
Problem: Suspend test fails on Mac OS when suspending Vim. Solution: Make 'keyprotocol' empty.
-rw-r--r--src/testdir/test_suspend.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim
index ef8fea53e..5175c0f63 100644
--- a/src/testdir/test_suspend.vim
+++ b/src/testdir/test_suspend.vim
@@ -34,7 +34,7 @@ func Test_suspend()
call term_sendkeys(buf, v:progpath
\ . " --clean -X"
- \ . " -c 'set nu'"
+ \ . " -c 'set nu keyprotocol='"
\ . " -c 'call setline(1, \"foo\")'"
\ . " Xfoo\<CR>")
" Cursor in terminal buffer should be on first line in spawned vim.
@@ -84,7 +84,7 @@ func Test_suspend_autocmd()
call term_sendkeys(buf, v:progpath
\ . " --clean -X"
- \ . " -c 'set nu'"
+ \ . " -c 'set nu keyprotocol='"
\ . " -c 'let g:count = 0'"
\ . " -c 'au VimSuspend * let g:count += 1'"
\ . " -c 'au VimResume * let g:count += 1'"
diff --git a/src/version.c b/src/version.c
index 10e56c139..d4a3b1bf2 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 */
/**/
+ 1022,
+/**/
1021,
/**/
1020,