From a903472cfa048e7a29d9c6ed0945ef03e48c6a08 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 13 Mar 2018 15:43:46 +0100
Subject: 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.
---
 src/testdir/shared.vim     | 10 ++++++++++
 src/testdir/test_paste.vim |  4 +++-
 src/version.c              |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'src')

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
@@ -766,6 +766,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1604,
 /**/
     1603,
 /**/
-- 
cgit v1.2.3