diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-01-04 15:10:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-04 15:10:31 +0100 |
| commit | 695703ca97e9330e3dbbeb3153b57b4ca565d045 (patch) | |
| tree | f6176a4f1476f0ba320e5729b29202991a4271dc | |
| parent | 1dc67f4dc83816bbfa19557a80d49301efe157c1 (diff) | |
| download | rneovim-695703ca97e9330e3dbbeb3153b57b4ca565d045.tar.gz rneovim-695703ca97e9330e3dbbeb3153b57b4ca565d045.tar.bz2 rneovim-695703ca97e9330e3dbbeb3153b57b4ca565d045.zip | |
provider/clipboard.vim: fallback if xsel is broken (#5868)
Old versions of `xsel` do not support some required features.
Fall back to `xclip` then.
Closes #5853
| -rw-r--r-- | runtime/autoload/provider/clipboard.vim | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim index 581cec036e..b8baaa8c64 100644 --- a/runtime/autoload/provider/clipboard.vim +++ b/runtime/autoload/provider/clipboard.vim @@ -33,6 +33,12 @@ function! s:try_cmd(cmd, ...) return out endfunction +" Returns TRUE if `cmd` exits with success, else FALSE. +function! s:cmd_ok(cmd) + call system(a:cmd) + return v:shell_error == 0 +endfunction + let s:cache_enabled = 1 let s:err = '' @@ -48,7 +54,7 @@ function! provider#clipboard#Executable() abort let s:paste['*'] = s:paste['+'] let s:cache_enabled = 0 return 'pbcopy' - elseif exists('$DISPLAY') && executable('xsel') + elseif exists('$DISPLAY') && executable('xsel') && s:cmd_ok('xsel -o -b') let s:copy['+'] = 'xsel --nodetach -i -b' let s:paste['+'] = 'xsel -o -b' let s:copy['*'] = 'xsel --nodetach -i -p' |