mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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.
This commit is contained in:
parent
f118d4847e
commit
a903472cfa
@ -260,6 +260,16 @@ func CanRunGui()
|
|||||||
return has('gui') && ($DISPLAY != "" || has('gui_running'))
|
return has('gui') && ($DISPLAY != "" || has('gui_running'))
|
||||||
endfunc
|
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.
|
" Get line "lnum" as displayed on the screen.
|
||||||
" Trailing white space is trimmed.
|
" Trailing white space is trimmed.
|
||||||
func! Screenline(lnum)
|
func! Screenline(lnum)
|
||||||
|
@ -6,6 +6,8 @@ if has('gui_running')
|
|||||||
endif
|
endif
|
||||||
set term=xterm
|
set term=xterm
|
||||||
|
|
||||||
|
source shared.vim
|
||||||
|
|
||||||
func Test_paste_normal_mode()
|
func Test_paste_normal_mode()
|
||||||
new
|
new
|
||||||
" In first column text is inserted
|
" In first column text is inserted
|
||||||
@ -67,7 +69,7 @@ func Test_paste_insert_mode()
|
|||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_paste_clipboard()
|
func Test_paste_clipboard()
|
||||||
if !has('clipboard')
|
if !WorkingClipboard()
|
||||||
return
|
return
|
||||||
endif
|
endif
|
||||||
let @+ = "nasty\<Esc>:!ls\<CR>command"
|
let @+ = "nasty\<Esc>:!ls\<CR>command"
|
||||||
|
@ -766,6 +766,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1604,
|
||||||
/**/
|
/**/
|
||||||
1603,
|
1603,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user