vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix offset jumping to patch on :Gblame --reverse

Browse Source
This commit is contained in:
Tim Pope 2019-08-13 17:20:00 -04:00
parent 8038ee60a9
commit 16bfd4fa92
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autoload/fugitive.vim
View File

@ -4837,6 +4837,7 @@ function! s:BlameCommit(cmd, ...) abort
if commit =~# '^0*$' if commit =~# '^0*$'
return 'echoerr ' . string('fugitive: no commit') return 'echoerr ' . string('fugitive: no commit')
endif endif
let sigil = has_key(a:0 ? a:2 : s:TempState(), 'blame_reverse_end') ? '-' : '+'
let cmd = s:Open((s:BlameBufnr() < 0 ? '' : &splitbelow ? "botright " : "topleft ") . a:cmd, 0, '', commit, [commit]) let cmd = s:Open((s:BlameBufnr() < 0 ? '' : &splitbelow ? "botright " : "topleft ") . a:cmd, 0, '', commit, [commit])
if cmd =~# '^echoerr' if cmd =~# '^echoerr'
return cmd return cmd
@ -4849,8 +4850,9 @@ function! s:BlameCommit(cmd, ...) abort
call search('^+++') call search('^+++')
let head = line('.') let head = line('.')
while search('^@@ \|^diff ') && getline('.') =~# '^@@ ' while search('^@@ \|^diff ') && getline('.') =~# '^@@ '
let top = +matchstr(getline('.'),' +\zs\d\+') let top = +matchstr(getline('.'),' ' . sigil .'\zs\d\+')
let len = +matchstr(getline('.'),' +\d\+,\zs\d\+') let len = +matchstr(getline('.'),' ' . sigil . '\d\+,\zs\d\+')
echo [sigil, top, len]
if lnum >= top && lnum <= top + len if lnum >= top && lnum <= top + len
let offset = lnum - top let offset = lnum - top
if &scrolloff if &scrolloff
@ -4862,7 +4864,7 @@ function! s:BlameCommit(cmd, ...) abort
endif endif
while offset > 0 && line('.') < line('$') while offset > 0 && line('.') < line('$')
+ +
if getline('.') =~# '^[ +]' if getline('.') =~# '^[ ' . sigil . ']'
let offset -= 1 let offset -= 1
endif endif
endwhile endwhile