diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-13 15:43:46 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-13 15:43:46 +0100 |
| commit | a903472cfa048e7a29d9c6ed0945ef03e48c6a08 (patch) | |
| tree | 86750b67c2f752e72c9cd852c2f3dd5aa53f368d /src | |
| parent | f118d4847eb0dc2473260aebce301643568c5bc3 (diff) | |
patch 8.0.1604: paste test may fail if $DISPLAY is not setv8.0.1604
Problem: Paste test may fail if $DISPLAY is not set.
Solution: Add WorkingClipboard() and use it in the paste test.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/shared.vim | 10 | ||||
| -rw-r--r-- | src/testdir/test_paste.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim index 877c5f9d70..d47a355383 100644 --- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -260,6 +260,16 @@ func CanRunGui() return has('gui') && ($DISPLAY != "" || has('gui_running')) endfunc +func WorkingClipboard() + if !has('clipboard') + return 0 + endif + if has('x11') + return $DISPLAY != "" + endif + return 1 +endfunc + " Get line "lnum" as displayed on the screen. " Trailing white space is trimmed. func! Screenline(lnum) diff --git a/src/testdir/test_paste.vim b/src/testdir/test_paste.vim index 6450989ec0..65f300cef0 100644 --- a/src/testdir/test_paste.vim +++ b/src/testdir/test_paste.vim @@ -6,6 +6,8 @@ if has('gui_running') endif set term=xterm +source shared.vim + func Test_paste_normal_mode() new " In first column text is inserted @@ -67,7 +69,7 @@ func Test_paste_insert_mode() endfunc func Test_paste_clipboard() - if !has('clipboard') + if !WorkingClipboard() return endif let @+ = "nasty\<Esc>:!ls\<CR>command" diff --git a/src/version.c b/src/version.c index d1fd6ea5f9..36e94b1228 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1604, +/**/ 1603, /**/ 1602, |