summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-15 13:13:54 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-15 13:13:54 +0200
commit1755ec4278ee6dccdbb8030fd5a4cf6054211f81 (patch)
tree746939a7d00de08fe9c09cf4969ac95280b13b92
parent650a63748c349bbb60adb912273e9bedd2b677c5 (diff)
downloadvim-git-1755ec4278ee6dccdbb8030fd5a4cf6054211f81.tar.gz
patch 8.1.1536: popup select test still fails on Macv8.1.1536
Problem: Popup select test still fails on Mac. Solution: Set 'clipboard' to "autoselect"
-rw-r--r--src/testdir/test_popupwin.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 79207c8b2..be86fdc54 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -328,6 +328,7 @@ func Test_popup_select()
endif
" create a popup with some text to be selected
let lines =<< trim END
+ set clipboard=autoselect
call setline(1, range(1, 20))
let winid = popup_create(['the word', 'some more', 'several words here'], {
\ 'drag': 1,
diff --git a/src/version.c b/src/version.c
index 7d4d06d11..f379701ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1536,
+/**/
1535,
/**/
1534,