summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-04-18 19:16:55 +0100
committerBram Moolenaar <Bram@vim.org>2022-04-18 19:16:55 +0100
commit861fcee8de19a694de413dd28e0ebe80010f0b4f (patch)
tree8437d73a3d7be8569f0ef08f07fb9e58cf56d9de
parent3aca0916f0dba6114ae0f7d5458763a934fe7a02 (diff)
downloadvim-git-861fcee8de19a694de413dd28e0ebe80010f0b4f.tar.gz
patch 8.2.4786: test for win_gotoid() in Visual mode fails on Macv8.2.4786
Problem: Test for win_gotoid() in Visual mode fails on Mac. Solution: Skip the test on MacOS.
-rw-r--r--src/testdir/test_vim9_builtin.vim3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index 7dde24c68..ac4ca3711 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -4497,7 +4497,8 @@ enddef
func Test_win_gotoid_in_mapping()
CheckScreendump
- if has('clipboard_working')
+ " requires a working clipboard and this doesn't work on MacOS
+ if has('clipboard_working') && !has('mac')
let @* = 'foo'
let lines =<< trim END
set cmdheight=2
diff --git a/src/version.c b/src/version.c
index f3f88125b..9d3a9b551 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4786,
+/**/
4785,
/**/
4784,