thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.1298: invalid argument test fails without X clipboard

Browse Source 
Problem:    Invalid argument test fails without X clipboard.
Solution:   Test -display only with the +xterm_clipboard feature.
This commit is contained in:
Bram Moolenaar
2019-05-08 18:36:43 +02:00
parent 240f7abab0
commit 5416b75031
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/testdir/test_startup.vim
View File

@@ -430,7 +430,7 @@ func Test_invalid_args()
call assert_equal('More info with: "vim -h"', out[2]) call assert_equal('More info with: "vim -h"', out[2])
endif endif
if has('clipboard') if has('xterm_clipboard')
let out = split(system(GetVimCommand() .. ' -display'), "\n") let out = split(system(GetVimCommand() .. ' -display'), "\n")
call assert_equal(1, v:shell_error) call assert_equal(1, v:shell_error)
call assert_match('^VIM - Vi IMproved .* (.*)$', out[0]) call assert_match('^VIM - Vi IMproved .* (.*)$', out[0])

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1298,
/**/ /**/
1297, 1297,
/**/ /**/