Github/vim-plug
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 40ef7a83a4 into e1b7f1ae85

Browse Source
This commit is contained in:
Jeremy Pallats/starcraft.man 2015-03-23 19:04:34 +00:00
commit 3e7fcdef8d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plug.vim
View File

@ -602,6 +602,9 @@ function! s:prepare()
xnoremap <silent> <buffer> U :call <SID>status_update()<cr> xnoremap <silent> <buffer> U :call <SID>status_update()<cr>
nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr> nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr> nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
if s:nvim
nnoremap <silent> <buffer> <C-C> :call <SID>job_abort(1)<cr>
endif
let b:plug_preview = -1 let b:plug_preview = -1
let s:plug_tab = tabpagenr() let s:plug_tab = tabpagenr()
let s:plug_buf = winbufnr(0) let s:plug_buf = winbufnr(0)
@ -813,7 +816,7 @@ function! s:update_finish()
endif endif
endfunction endfunction
function! s:job_abort() function! s:job_abort(...)
if !s:nvim || !exists('s:jobs') if !s:nvim || !exists('s:jobs')
return return
endif endif
@ -825,6 +828,9 @@ function! s:job_abort()
if j.new if j.new
call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir)) call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
endif endif
if len(a:000) != 0
call s:log('x', name, "Interrupted!\n")
endif
endfor endfor
let s:jobs = {} let s:jobs = {}
endfunction endfunction
@ -1610,7 +1616,7 @@ function! s:compare_git_uri(a, b)
endfunction endfunction
function! s:format_message(bullet, name, message) function! s:format_message(bullet, name, message)
if a:bullet != 'x' if a:bullet != 'x' || a:message == "Interrupted!\n"
return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))]
else else
let lines = map(s:lines(a:message), '" ".v:val') let lines = map(s:lines(a:message), '" ".v:val')