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

Use keepalt for diff maps

Browse Source 
Resolves: https://github.com/tpope/vim-fugitive/issues/2336
This commit is contained in:
Tim Pope
2024-09-06 19:59:21 -04:00
parent 1d18c696c4
commit d4877e54ce
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
autoload/fugitive.vim
View File

@@ -4986,19 +4986,19 @@ function! s:StageDiff(diff) abort
return 'Git --paginate diff --no-ext-diff' return 'Git --paginate diff --no-ext-diff'
elseif len(info.paths) > 1 elseif len(info.paths) > 1
execute 'Gedit' . prefix s:fnameescape(':0:' . info.paths[0]) execute 'Gedit' . prefix s:fnameescape(':0:' . info.paths[0])
return a:diff . '! @:'.s:fnameescape(info.paths[1]) return 'keepalt ' . a:diff . '! @:'.s:fnameescape(info.paths[1])
elseif info.section ==# 'Staged' && info.sigil ==# '-' elseif info.section ==# 'Staged' && info.sigil ==# '-'
execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0]) execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
return a:diff . '! :0:%' return 'keepalt ' . a:diff . '! :0:%'
elseif info.section ==# 'Staged' elseif info.section ==# 'Staged'
execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0]) execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
return a:diff . '! @:%' return 'keepalt ' . a:diff . '! @:%'
elseif info.sigil ==# '-' elseif info.sigil ==# '-'
execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0]) execute 'Gedit' prefix s:fnameescape(':0:'.info.paths[0])
return a:diff . '! :(top)%' return 'keepalt ' . a:diff . '! :(top)%'
else else
execute 'Gedit' prefix s:fnameescape(':(top)'.info.paths[0]) execute 'Gedit' prefix s:fnameescape(':(top)'.info.paths[0])
return a:diff . '!' return 'keepalt ' . a:diff . '!'
endif endif
endfunction endfunction
@@ -7995,10 +7995,10 @@ function! fugitive#MapJumps(...) abort
endif endif
call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent><unique>') call s:Map('n', 'D', ":echoerr 'fugitive: D has been removed in favor of dd'<CR>", '<silent><unique>')
call s:Map('n', 'dd', ":<C-U>call fugitive#DiffClose()<Bar>Gdiffsplit!<CR>", '<silent>') call s:Map('n', 'dd', ":<C-U>call fugitive#DiffClose()<Bar>keepalt Gdiffsplit!<CR>", '<silent>')
call s:Map('n', 'dh', ":<C-U>call fugitive#DiffClose()<Bar>Ghdiffsplit!<CR>", '<silent>') call s:Map('n', 'dh', ":<C-U>call fugitive#DiffClose()<Bar>keepalt Ghdiffsplit!<CR>", '<silent>')
call s:Map('n', 'ds', ":<C-U>call fugitive#DiffClose()<Bar>Ghdiffsplit!<CR>", '<silent>') call s:Map('n', 'ds', ":<C-U>call fugitive#DiffClose()<Bar>keepalt Ghdiffsplit!<CR>", '<silent>')
call s:Map('n', 'dv', ":<C-U>call fugitive#DiffClose()<Bar>Gvdiffsplit!<CR>", '<silent>') call s:Map('n', 'dv', ":<C-U>call fugitive#DiffClose()<Bar>keepalt Gvdiffsplit!<CR>", '<silent>')
call s:Map('n', 'd?', ":<C-U>help fugitive_d<CR>", '<silent>') call s:Map('n', 'd?', ":<C-U>help fugitive_d<CR>", '<silent>')
else else