mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-18 08:13:44 -05:00
Merge 0b387893ef into b068eaf1e6
This commit is contained in:
@@ -8138,6 +8138,9 @@ function! s:BranchCfile(result) abort
|
||||
endfunction
|
||||
|
||||
let s:diff_header_pattern = '^diff --git \%("\=[abciow12]/.*\|/dev/null\) \%("\=[abciow12]/.*\|/dev/null\)$'
|
||||
let s:rdiff_hash_or_missing = '\(\x\{7,40\}\|-\{7,40\}\)'
|
||||
let s:rdiff_side = '\%(-\|\d\+\):\s\+' . s:rdiff_hash_or_missing
|
||||
let s:rdiff_header_pattern = '^' . s:rdiff_side . '\s\+[=!<>]\s\+' . s:rdiff_side . '\s\+'
|
||||
function! s:cfile() abort
|
||||
let temp_state = s:TempState()
|
||||
let name = substitute(get(get(temp_state, 'args', []), 0, ''), '\%(^\|-\)\(\l\)', '\u\1', 'g')
|
||||
@@ -8235,6 +8238,19 @@ function! s:cfile() abort
|
||||
let dcmds = ['', 'Gdiffsplit! >' . myhash . '^:' . fnameescape(files[0])]
|
||||
endif
|
||||
|
||||
elseif getline('.') =~# s:rdiff_header_pattern
|
||||
let ref = ''
|
||||
let matches = matchlist(getline('.'), s:rdiff_header_pattern)
|
||||
if matches[1] =~# '^-\+$' && matches[2] =~# '^\x\{7,40\}$'
|
||||
let ref = matches[2]
|
||||
elseif matches[2] =~# '^-\+$' && matches[1] =~# '^\x\{7,40\}$'
|
||||
let ref = matches[1]
|
||||
elseif matches[1] =~# '^\x\{7,40\}$' && matches[1] == matches[2]
|
||||
let ref = matches[1]
|
||||
elseif expand('<cword>') =~# '^\x\{7,40\}$'
|
||||
let ref = expand('<cword>')
|
||||
endif
|
||||
|
||||
elseif getline('.') =~# '^[+-]'
|
||||
let [header_lnum, old_lnum, new_lnum] = s:HunkPosition(line('.'))
|
||||
if new_lnum > 0
|
||||
|
||||
Reference in New Issue
Block a user