IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

provider/clipboard.vim: fix logic issue #7042

Browse Source 
Closes #7039
This commit is contained in:
Andy Russell 2017-07-16 14:46:38 -04:00 committed by Justin M. Keyes
parent d0537961c1
commit 26124b4800
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
runtime/autoload/provider/clipboard.vim
View File

@ -16,6 +16,12 @@ function! s:selection.on_exit(jobid, data, event) abort
endif endif
endfunction endfunction
function! s:selection.on_stderr(jobid, data, event) abort
echohl WarningMsg
echomsg 'clipboard: error invoking '.get(self.argv, 0, '?').': '.join(a:data)
echohl None
endfunction
let s:selections = { '*': s:selection, '+': copy(s:selection)} let s:selections = { '*': s:selection, '+': copy(s:selection)}
function! s:try_cmd(cmd, ...) abort function! s:try_cmd(cmd, ...) abort
@ -135,24 +141,17 @@ function! s:clipboard.set(lines, regtype, reg) abort
end end
let selection.data = [a:lines, a:regtype] let selection.data = [a:lines, a:regtype]
let argv = split(s:copy[a:reg], " ") let argv = split(s:copy[a:reg], " ")
let selection.argv = argv
let selection.detach = s:cache_enabled let selection.detach = s:cache_enabled
let selection.cwd = "/" let selection.cwd = "/"
call extend(selection, {
\ 'on_stdout': function('s:set_errhandler'),
\ 'on_stderr': function('s:set_errhandler'),
\ })
let jobid = jobstart(argv, selection) let jobid = jobstart(argv, selection)
if jobid > 0 if jobid > 0
call jobsend(jobid, a:lines) call jobsend(jobid, a:lines)
call jobclose(jobid, 'stdin') call jobclose(jobid, 'stdin')
let selection.owner = jobid let selection.owner = jobid
endif else
endfunction
function! s:set_errhandler(job_id, data, event) abort
if a:job_id <= 0
echohl WarningMsg echohl WarningMsg
echo 'clipboard: error when invoking provider: ' . join(a:data) echomsg 'clipboard: failed to execute: '.(s:copy[a:reg])
echohl None echohl None
endif endif
endfunction endfunction