VimPlug/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-12-07 20:54:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix timer invocation

Browse Source 
References https://github.com/tpope/vim-fugitive/issues/1329
This commit is contained in:
Tim Pope
2019-12-07 10:10:02 -05:00
parent 5d37b17e34
commit 6d4564a05e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/fugitive.vim
View File

@@ -3758,7 +3758,7 @@ function! s:PullSubcommand(line1, line2, range, bang, mods, args) abort
return s:MergeRebase('pull', a:bang, a:mods, a:args) return s:MergeRebase('pull', a:bang, a:mods, a:args)
endfunction endfunction
function! s:RebaseContinue(arg) abort function! s:RebaseContinue(arg, ...) abort
let [dir, edit_todo] = a:arg let [dir, edit_todo] = a:arg
exe s:MergeRebase('rebase', 0, '', [edit_todo && getfsize(fugitive#Find('.git/rebase-merge/git-rebase-todo', dir)) <= 0 ? '--abort' : '--continue'], dir) exe s:MergeRebase('rebase', 0, '', [edit_todo && getfsize(fugitive#Find('.git/rebase-merge/git-rebase-todo', dir)) <= 0 ? '--abort' : '--continue'], dir)
endfunction endfunction
@@ -3774,7 +3774,7 @@ augroup fugitive_merge
\ endif \ endif
autocmd BufEnter * nested autocmd BufEnter * nested
\ if exists('s:rebase_continue') | \ if exists('s:rebase_continue') |
\ if has('timer') | \ if has('timers') |
\ call timer_start(0, function('s:RebaseContinue', [remove(s:, 'rebase_continue')])) | \ call timer_start(0, function('s:RebaseContinue', [remove(s:, 'rebase_continue')])) |
\ else | \ else |
\ call s:RebaseContinue(remove(s:, 'rebase_continue')) | \ call s:RebaseContinue(remove(s:, 'rebase_continue')) |