vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compensate for bad 'shellredir'

Browse Source
This commit is contained in:
Tim Pope 2019-07-28 19:11:03 -04:00
parent 49f3f92fd5
commit 3b0f68180f
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/fugitive.vim
View File

@ -420,6 +420,14 @@ endfunction
function! s:SystemError(cmd, ...) abort function! s:SystemError(cmd, ...) abort
try try
if &shellredir ==# '>' && &shell =~# 'sh\|cmd'
let shellredir = &shellredir
if &shell =~# 'csh'
set shellredir=>&
else
set shellredir=>%s\ 2>&1
endif
endif
let out = call('system', [type(a:cmd) ==# type([]) ? fugitive#Prepare(a:cmd) : a:cmd] + a:000) let out = call('system', [type(a:cmd) ==# type([]) ? fugitive#Prepare(a:cmd) : a:cmd] + a:000)
return [out, v:shell_error] return [out, v:shell_error]
catch /^Vim\%((\a\+)\)\=:E484:/ catch /^Vim\%((\a\+)\)\=:E484:/
@ -427,6 +435,10 @@ function! s:SystemError(cmd, ...) abort
call filter(opts, 'exists("+".v:val) && !empty(eval("&".v:val))') call filter(opts, 'exists("+".v:val) && !empty(eval("&".v:val))')
call map(opts, 'v:val."=".eval("&".v:val)') call map(opts, 'v:val."=".eval("&".v:val)')
call s:throw('failed to run `' . a:cmd . '` with ' . join(opts, ' ')) call s:throw('failed to run `' . a:cmd . '` with ' . join(opts, ' '))
finally
if exists('shellredir')
let &shellpipe = shellredir
endif
endtry endtry
endfunction endfunction