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

Rename temp state bufnr field to origin_bufnr

Browse Source 
I intend to expand the use of this temp state to contexts where this
field could be erroneously interpreted as the buffer number of the temp
file itself.
This commit is contained in:
Tim Pope
2021-03-12 17:24:08 -05:00
parent d0e277c7be
commit 1ccb082753
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
autoload/fugitive.vim
View File

@@ -885,8 +885,8 @@ function! fugitive#Path(url, ...) abort
endif endif
let url = a:url let url = a:url
let temp_state = s:TempState(url) let temp_state = s:TempState(url)
if has_key(temp_state, 'bufnr') if has_key(temp_state, 'origin_bufnr')
let url = bufname(temp_state.bufnr) let url = bufname(temp_state.origin_bufnr)
endif endif
let url = s:Slash(fnamemodify(url, ':p')) let url = s:Slash(fnamemodify(url, ':p'))
if url =~# '/$' && s:Slash(a:url) !~# '/$' if url =~# '/$' && s:Slash(a:url) !~# '/$'
@@ -1070,9 +1070,9 @@ let s:expand = '\%(\(' . s:var . '\)\(' . s:flag . '*\)\(:S\)\=\)'
function! s:BufName(var) abort function! s:BufName(var) abort
if a:var ==# '%' if a:var ==# '%'
return bufname(get(s:TempState(), 'bufnr', '')) return bufname(get(s:TempState(), 'origin_bufnr', ''))
elseif a:var =~# '^#\d*$' elseif a:var =~# '^#\d*$'
let nr = get(s:TempState(bufname(+a:var[1:-1])), 'bufnr', '') let nr = get(s:TempState(bufname(+a:var[1:-1])), 'origin_bufnr', '')
return bufname(nr ? nr : +a:var[1:-1]) return bufname(nr ? nr : +a:var[1:-1])
else else
return expand(a:var) return expand(a:var)
@@ -5149,7 +5149,7 @@ endfunction
function! s:BlameBufnr(...) abort function! s:BlameBufnr(...) abort
let state = s:TempState(bufname(a:0 ? a:1 : '')) let state = s:TempState(bufname(a:0 ? a:1 : ''))
if get(state, 'filetype', '') ==# 'fugitiveblame' if get(state, 'filetype', '') ==# 'fugitiveblame'
return get(state, 'bufnr', -1) return get(state, 'origin_bufnr', -1)
else else
return -1 return -1
endif endif
@@ -5343,7 +5343,7 @@ function! s:BlameSubcommand(line1, count, range, bang, mods, options) abort
silent tabedit % silent tabedit %
endif endif
let bufnr = bufnr('') let bufnr = bufnr('')
let temp_state.bufnr = bufnr let temp_state.origin_bufnr = bufnr
let restore = [] let restore = []
let mods = substitute(a:mods, '\<tab\>', '', 'g') let mods = substitute(a:mods, '\<tab\>', '', 'g')
for winnr in range(winnr('$'),1,-1) for winnr in range(winnr('$'),1,-1)