m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-16 07:13:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Eliminate blank line after resuming from GIT_EDITOR

Browse Source 
Also add has_key(a:tmp, 'echo') checks to allow for future async
workflows.
This commit is contained in:
Tim Pope
2021-03-27 20:43:19 -04:00
parent f7321f6d5b
commit f4acdcc5b4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/fugitive.vim
View File

@@ -2490,6 +2490,9 @@ function! s:RunSend(job, str) abort
endfunction endfunction
function! s:RunEcho(tmp) abort function! s:RunEcho(tmp) abort
if !has_key(a:tmp, 'echo')
return
endif
let data = a:tmp.echo let data = a:tmp.echo
let a:tmp.echo = matchstr(data, "[\r\n]\\+$") let a:tmp.echo = matchstr(data, "[\r\n]\\+$")
if len(a:tmp.echo) if len(a:tmp.echo)
@@ -2541,7 +2544,10 @@ function! s:RunWait(state, tmp, job) abort
throw 'fugitive: close callback did not fire; this should never happen' throw 'fugitive: close callback did not fire; this should never happen'
endif endif
call s:RunEcho(a:tmp) call s:RunEcho(a:tmp)
echo if has_key(a:tmp, 'echo')
let a:tmp.echo = substitute(a:tmp.echo, "^\r\\=\n", '', '')
echo
endif
call s:RunEdit(a:state, a:tmp, a:job) call s:RunEdit(a:state, a:tmp, a:job)
let finished = 1 let finished = 1
finally finally