File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -260,6 +260,16 @@ func CanRunGui()
260260 return has (' gui' ) && ($DISPLAY != " " || has (' gui_running' ))
261261endfunc
262262
263+ func WorkingClipboard ()
264+ if ! has (' clipboard' )
265+ return 0
266+ endif
267+ if has (' x11' )
268+ return $DISPLAY != " "
269+ endif
270+ return 1
271+ endfunc
272+
263273" Get line "lnum" as displayed on the screen.
264274" Trailing white space is trimmed.
265275func ! Screenline (lnum)
Original file line number Diff line number Diff line change @@ -6,6 +6,8 @@ if has('gui_running')
66endif
77set term = xterm
88
9+ source shared.vim
10+
911func Test_paste_normal_mode ()
1012 new
1113 " In first column text is inserted
@@ -67,7 +69,7 @@ func Test_paste_insert_mode()
6769endfunc
6870
6971func Test_paste_clipboard ()
70- if ! has ( ' clipboard ' )
72+ if ! WorkingClipboard ( )
7173 return
7274 endif
7375 let @+ = " nasty\<Esc> :!ls\<CR> command"
Original file line number Diff line number Diff line change @@ -766,6 +766,8 @@ static char *(features[]) =
766766
767767static int included_patches [] =
768768{ /* Add new patch number below this line */
769+ /**/
770+ 1604 ,
769771/**/
770772 1603 ,
771773/**/
You can’t perform that action at this time.
0 commit comments