Mercurial > vim
changeset 13460:aa6ecb272236 v8.0.1604
patch 8.0.1604: paste test may fail if $DISPLAY is not set
commit https://github.com/vim/vim/commit/a903472cfa048e7a29d9c6ed0945ef03e48c6a08
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 13 15:43:46 2018 +0100
patch 8.0.1604: paste test may fail if $DISPLAY is not set
Problem: Paste test may fail if $DISPLAY is not set.
Solution: Add WorkingClipboard() and use it in the paste test.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 13 Mar 2018 15:45:07 +0100 |
| parents | 4879a00cec7f |
| children | da182163b61d |
| files | src/testdir/shared.vim src/testdir/test_paste.vim src/version.c |
| diffstat | 3 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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"