Mercurial > vim
changeset 17686:853afcc375b2 v8.1.1840
patch 8.1.1840: Testing: WorkingClipboard() is not accurate
commit https://github.com/vim/vim/commit/52992feafe8a996fbce29b97ae135abc169aa716
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 12 14:20:33 2019 +0200
patch 8.1.1840: Testing: WorkingClipboard() is not accurate
Problem: Testing: WorkingClipboard() is not accurate.
Solution: Check feature clipboard_working instead.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 12 Aug 2019 14:30:06 +0200 |
| parents | 118242d58076 |
| children | b8738c462084 |
| files | src/testdir/shared.vim src/testdir/test_paste.vim src/testdir/test_quotestar.vim src/testdir/test_termcodes.vim src/version.c |
| diffstat | 5 files changed, 7 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/shared.vim +++ b/src/testdir/shared.vim @@ -322,13 +322,3 @@ func RunVimPiped(before, after, argument endif return 1 endfunc - -func WorkingClipboard() - if !has('clipboard') - return 0 - endif - if has('x11') - return $DISPLAY != "" - endif - return 1 -endfunc
--- a/src/testdir/test_paste.vim +++ b/src/testdir/test_paste.vim @@ -70,9 +70,8 @@ func Test_paste_insert_mode() endfunc func Test_paste_clipboard() - if !WorkingClipboard() - return - endif + CheckFeature clipboard_working + let @+ = "nasty\<Esc>:!ls\<CR>command" new exe "normal i\<C-R>+\<Esc>"
--- a/src/testdir/test_quotestar.vim +++ b/src/testdir/test_quotestar.vim @@ -1,11 +1,9 @@ " *-register (quotestar) tests source shared.vim -if !WorkingClipboard() - throw 'Skipped: no working clipboard' -endif +source check.vim -source shared.vim +CheckFeature clipboard_working func Do_test_quotestar_for_macunix() if empty(exepath('pbcopy')) || empty(exepath('pbpaste'))
--- a/src/testdir/test_termcodes.vim +++ b/src/testdir/test_termcodes.vim @@ -182,9 +182,7 @@ func Test_xterm_mouse_ctrl_click() endfunc func Test_term_mouse_middle_click() - if !WorkingClipboard() - throw 'Skipped: No working clipboard' - endif + CheckFeature clipboard_working new let save_mouse = &mouse