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.

diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index c7e38aef6b0b565e230f823990158f67fa33dd28..1334201a7eeca9c208d8963f8b2ad95232d10f4e 100644 (file)
--- 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 af10e1d5c3740e8c0369510167923f71d31425ca..2862a6a553e4ab84b6663dabb466edcfbe82c265 100644 (file)
--- 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 1bdcaaf0a39048040ff07187848a2f3b3df9534c..fdbb9a63bc585e14820ddbd52308cdca18dbdf2a 100644 (file)
--- 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,
 /**/