File tree Expand file tree Collapse file tree 3 files changed +15
-1
lines changed Expand file tree Collapse file tree 3 files changed +15
-1
lines changed Original file line number Diff line number Diff line change @@ -260,6 +260,16 @@ func CanRunGui()
260
260
return has (' gui' ) && ($DISPLAY != " " || has (' gui_running' ))
261
261
endfunc
262
262
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
+
263
273
" Get line "lnum" as displayed on the screen.
264
274
" Trailing white space is trimmed.
265
275
func ! Screenline (lnum)
Original file line number Diff line number Diff line change @@ -6,6 +6,8 @@ if has('gui_running')
6
6
endif
7
7
set term = xterm
8
8
9
+ source shared.vim
10
+
9
11
func Test_paste_normal_mode ()
10
12
new
11
13
" In first column text is inserted
@@ -67,7 +69,7 @@ func Test_paste_insert_mode()
67
69
endfunc
68
70
69
71
func Test_paste_clipboard ()
70
- if ! has ( ' clipboard ' )
72
+ if ! WorkingClipboard ( )
71
73
return
72
74
endif
73
75
let @+ = " nasty\<Esc> :!ls\<CR> command"
Original file line number Diff line number Diff line change @@ -766,6 +766,8 @@ static char *(features[]) =
766
766
767
767
static int included_patches [] =
768
768
{ /* Add new patch number below this line */
769
+ /**/
770
+ 1604 ,
769
771
/**/
770
772
1603 ,
771
773
/**/
You can’t perform that action at this time.
0 commit comments