diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-08 18:36:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-08 18:36:43 +0200 |
| commit | 5416b75031138182387399f8fe5e17a884414e1a (patch) | |
| tree | bf3c3eb55dee9c444077bc57000138a524970a28 | |
| parent | 240f7abab01b5e3fd5336dd780e42501ec3f2fcb (diff) | |
| download | vim-git-5416b75031138182387399f8fe5e17a884414e1a.tar.gz | |
patch 8.1.1298: invalid argument test fails without X clipboardv8.1.1298
Problem: Invalid argument test fails without X clipboard.
Solution: Test -display only with the +xterm_clipboard feature.
| -rw-r--r-- | src/testdir/test_startup.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 61c508275..8f494a850 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -430,7 +430,7 @@ func Test_invalid_args() call assert_equal('More info with: "vim -h"', out[2]) endif - if has('clipboard') + if has('xterm_clipboard') let out = split(system(GetVimCommand() .. ' -display'), "\n") call assert_equal(1, v:shell_error) call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) diff --git a/src/version.c b/src/version.c index da0d1dfab..90f9e87bf 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1298, +/**/ 1297, /**/ 1296, |