# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1520952307 -3600
# Node ID aa6ecb2722364190bf56d2806c049aa31f3bcafa
# Parent  4879a00cec7f70e43d3e18aa8784fa24151b76f8
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.

diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
--- 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
--- 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
--- 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 */
 /**/
+    1604,
+/**/
     1603,
 /**/
     1602,