diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-15 00:29:33 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-15 00:29:33 +0200 |
| commit | 650a63748c349bbb60adb912273e9bedd2b677c5 (patch) | |
| tree | e1f2c72e884eebfcb4da88862727e865b3cb0663 | |
| parent | bd75b5333d10e63f7a667d4b65e80d309435629e (diff) | |
| download | vim-git-650a63748c349bbb60adb912273e9bedd2b677c5.tar.gz | |
patch 8.1.1535: popup select test fails on Macv8.1.1535
Problem: Popup select test fails on Mac.
Solution: Skip test if clipboard feature not available.
| -rw-r--r-- | src/testdir/test_popupwin.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim index 6e11bba73..79207c8b2 100644 --- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -323,6 +323,9 @@ func Test_popup_select() if !CanRunVimInTerminal() throw 'Skipped: cannot make screendumps' endif + if !has('clipboard') + throw 'Skipped: clipboard feature missing' + endif " create a popup with some text to be selected let lines =<< trim END call setline(1, range(1, 20)) diff --git a/src/version.c b/src/version.c index 851cd5fa1..7d4d06d11 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 */ /**/ + 1535, +/**/ 1534, /**/ 1533, |