diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index e64f986..22d5ee6 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -4490,7 +4490,7 @@ function! s:OpenParse(args, wants_cmd) abort return [url, pre] endfunction -function! s:DiffClose() abort +function! fugitive#DiffClose() abort let mywinnr = winnr() for winnr in [winnr('#')] + range(winnr('$'),1,-1) if winnr != mywinnr && getwinvar(winnr,'&diff') @@ -5959,11 +5959,11 @@ function! fugitive#MapJumps(...) abort call s:Map('n', 'gO', ':0,4' . blame_map, '') call s:Map('n', 'O', ':0,5' . blame_map, '') - call s:Map('n', 'D', ":call DiffClose()Gdiffsplit!redrawechohl WarningMsg echo ':Gstatus D is deprecated in favor of dd'echohl NONE", '') - call s:Map('n', 'dd', ":call DiffClose()Gdiffsplit!", '') - call s:Map('n', 'dh', ":call DiffClose()Ghdiffsplit!", '') - call s:Map('n', 'ds', ":call DiffClose()Ghdiffsplit!", '') - call s:Map('n', 'dv', ":call DiffClose()Gvdiffsplit!", '') + call s:Map('n', 'D', ":call fugitive#DiffClose()Gdiffsplit!redrawechohl WarningMsg echo ':Gstatus D is deprecated in favor of dd'echohl NONE", '') + call s:Map('n', 'dd', ":call fugitive#DiffClose()Gdiffsplit!", '') + call s:Map('n', 'dh', ":call fugitive#DiffClose()Ghdiffsplit!", '') + call s:Map('n', 'ds', ":call fugitive#DiffClose()Ghdiffsplit!", '') + call s:Map('n', 'dv', ":call fugitive#DiffClose()Gvdiffsplit!", '') call s:Map('n', 'd?', ":help fugitive_d", '') else @@ -6000,7 +6000,7 @@ function! fugitive#MapJumps(...) abort call s:Map('nxo', '#', 'PatchSearchExpr(1)', '') endif call s:Map('n', 'S', ':echoerr "Use gO"', '') - call s:Map('n', 'dq', ":call DiffClose()", '') + call s:Map('n', 'dq', ":call fugitive#DiffClose()", '') call s:Map('n', '-', ":exe 'Gedit ' . fnameescape(NavigateUp(v:count1)) if getline(1) =~# '^tree \x\{40,\}$' && empty(getline(2))call search('^'.escape(expand('#:t'),'.*[]~\').'/\=$','wc')endif", '') call s:Map('n', 'P', ":exe 'Gedit ' . fnameescape(ContainingCommit().'^'.v:count1.Relative(':'))", '') call s:Map('n', '~', ":exe 'Gedit ' . fnameescape(ContainingCommit().'~'.v:count1.Relative(':'))", '')