Restore correct cursor position in commit buffer

Use `lockmarks` in fugitive#BufReadCmd to avoid offsetting marks.
This commit is contained in:
Pavol Juhas
2020-11-20 22:08:52 -08:00
committed by Tim Pope
parent 660d2ba2b6
commit e90478511d

View File

@@ -2159,13 +2159,13 @@ function! fugitive#BufReadCmd(...) abort
keepjumps 1 keepjumps 1
keepjumps call search('^parent ') keepjumps call search('^parent ')
if getline('.') ==# 'parent ' if getline('.') ==# 'parent '
silent keepjumps delete_ silent lockmarks keepjumps delete_
else else
silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps s/\m\C\%(^parent\)\@<! /\rparent /e' . (&gdefault ? '' : 'g') silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps s/\m\C\%(^parent\)\@<! /\rparent /e' . (&gdefault ? '' : 'g')
endif endif
keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3) keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3)
if lnum if lnum
silent keepjumps delete_ silent lockmarks keepjumps delete_
end end
silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps 1,/^diff --git\|\%$/s/\r$//e' silent exe (exists(':keeppatterns') ? 'keeppatterns' : '') 'keepjumps 1,/^diff --git\|\%$/s/\r$//e'
keepjumps 1 keepjumps 1