From 6cc52a1aabff060fdbdb1c1c3a47a9c6e96ad8b3 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Thu, 15 Aug 2019 03:33:20 -0400 Subject: [PATCH] Fix extra bang in diff maps --- autoload/fugitive.vim | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index 4ec7a88..1c19bf3 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -1828,12 +1828,12 @@ function! fugitive#BufReadStatus() abort call s:Map('x', "=", ":execute StageInline('toggle',line(\"'<\"),line(\"'>\")-line(\"'<\")+1)", '') call s:Map('x', "<", ":execute StageInline('hide', line(\"'<\"),line(\"'>\")-line(\"'<\")+1)", '') call s:Map('x', ">", ":execute StageInline('show', line(\"'<\"),line(\"'>\")-line(\"'<\")+1)", '') - call s:Map('n', 'D', ":execute StageDiff('Gdiffsplit!')redrawechohl WarningMsg echo ':Gstatus D is deprecated in favor of dd'echohl NONE", '') - call s:Map('n', 'dd', ":execute StageDiff('Gdiffsplit!')", '') - call s:Map('n', 'dh', ":execute StageDiff('Ghdiffsplit!')", '') - call s:Map('n', 'ds', ":execute StageDiff('Ghdiffsplit!')", '') + call s:Map('n', 'D', ":execute StageDiff('Gdiffsplit')redrawechohl WarningMsg echo ':Gstatus D is deprecated in favor of dd'echohl NONE", '') + call s:Map('n', 'dd', ":execute StageDiff('Gdiffsplit')", '') + call s:Map('n', 'dh', ":execute StageDiff('Ghdiffsplit')", '') + call s:Map('n', 'ds', ":execute StageDiff('Ghdiffsplit')", '') call s:Map('n', 'dp', ":execute StageDiffEdit()", '') - call s:Map('n', 'dv', ":execute StageDiff('Gvdiffsplit!')", '') + call s:Map('n', 'dv', ":execute StageDiff('Gvdiffsplit')", '') call s:Map('n', 'd?', ":help fugitive_d", '') call s:Map('n', 'P', ":execute StagePatch(line('.'),line('.')+v:count1-1)", '') call s:Map('x', 'P', ":execute StagePatch(line(\"'<\"),line(\"'>\"))", '') @@ -2927,10 +2927,10 @@ function! s:StageDiff(diff) abort return 'Git! diff --no-ext-diff' elseif len(info.paths) > 1 execute 'Gedit' . prefix s:fnameescape(':0:' . info.paths[0]) - return a:diff.'! HEAD:'.s:fnameescape(info.paths[1]) + return a:diff . '! HEAD:'.s:fnameescape(info.paths[1]) elseif info.section ==# 'Staged' && info.sigil ==# '-' execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0]) - return a:diff.'! :0:%' + return a:diff . '! :0:%' elseif info.section ==# 'Staged' execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0]) return a:diff . '! @:%'