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

clipboard: handle/avoid SIGTERM with previous owner #10765

Browse Source 
Fixes regression due to signal being reported with exit status.
ref #10573 939d9053bd
ref https://github.com/neovim/neovim/issues/7054#issuecomment-520282429
This commit is contained in:
Daniel Hahler 2019-08-14 09:58:52 +02:00 committed by Justin M. Keyes
parent 8fda095b6d
commit 2fafed6bb8
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,9 +159,7 @@ function! s:clipboard.set(lines, regtype, reg) abort
end end
if s:selections[a:reg].owner > 0 if s:selections[a:reg].owner > 0
" The previous provider instance should exit when the new one takes let prev_job = s:selections[a:reg].owner
" ownership, but kill it to be sure we don't fill up the job table.
call jobstop(s:selections[a:reg].owner)
end end
let s:selections[a:reg] = copy(s:selection) let s:selections[a:reg] = copy(s:selection)
let selection = s:selections[a:reg] let selection = s:selections[a:reg]
@ -175,13 +173,23 @@ function! s:clipboard.set(lines, regtype, reg) abort
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
let ret = 1
else else
echohl WarningMsg echohl WarningMsg
echomsg 'clipboard: failed to execute: '.(s:copy[a:reg]) echomsg 'clipboard: failed to execute: '.(s:copy[a:reg])
echohl None echohl None
return 0 let ret = 1
endif endif
return 1
" The previous provider instance should exit when the new one takes
" ownership, but kill it to be sure we don't fill up the job table.
if exists('prev_job')
call timer_start(1000, {... ->
\ jobwait([prev_job], 0)[0] == -1
\ && jobstop(prev_job)})
endif
return ret
endfunction endfunction
function! provider#clipboard#Call(method, args) abort function! provider#clipboard#Call(method, args) abort