From 564344ace9ef06b22e4e60a0196c41b410ac27da Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 28 Apr 2019 13:00:12 +0200 Subject: [PATCH] patch 8.1.1223: middle mouse click test fails without a clipboard Problem: Middle mouse click test fails without a clipboard. Solution: Check if the clipboard can be used. (Dominique Pelle, Christian Brabandt) Also use WorkingClipboard() instead of checking for the "clipboard" feature. --- src/testdir/test_quotestar.vim | 3 ++- src/testdir/test_termcodes.vim | 6 ++++++ src/version.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim index c7e38aef6..1334201a7 100644 --- a/src/testdir/test_quotestar.vim +++ b/src/testdir/test_quotestar.vim @@ -1,6 +1,7 @@ " *-register (quotestar) tests -if !has('clipboard') +source shared.vim +if !WorkingClipboard() finish endif diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim index af10e1d5c..2862a6a55 100644 --- a/src/testdir/test_termcodes.vim +++ b/src/testdir/test_termcodes.vim @@ -5,6 +5,8 @@ if has('gui_running') || !has('unix') finish endif +source shared.vim + " Helper function to emit a terminal escape code. func TerminalEscapeCode(code_xterm, code_sgr, row, col, m) if &ttymouse ==# 'xterm2' @@ -77,6 +79,10 @@ func Test_xterm_mouse_left_click() endfunc func Test_xterm_mouse_middle_click() + if !WorkingClipboard() + throw 'Skipped: No working clipboard' + endif + new let save_mouse = &mouse let save_term = &term diff --git a/src/version.c b/src/version.c index 1bdcaaf0a..fdbb9a63b 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 */ +/**/ + 1223, /**/ 1222, /**/ -- 2.40.0