mirror of
https://github.com/tpope/vim-fugitive.git
synced 2025-11-08 11:33:47 -05:00
Use window not buffer variable for window restore
This commit is contained in:
@@ -144,7 +144,7 @@ augroup fugitive
|
|||||||
autocmd BufNewFile,BufReadPost * call s:Detect(expand('<amatch>:p'))
|
autocmd BufNewFile,BufReadPost * call s:Detect(expand('<amatch>:p'))
|
||||||
autocmd FileType netrw call s:Detect(expand('<amatch>:p'))
|
autocmd FileType netrw call s:Detect(expand('<amatch>:p'))
|
||||||
autocmd VimEnter * if expand('<amatch>')==''|call s:Detect(getcwd())|endif
|
autocmd VimEnter * if expand('<amatch>')==''|call s:Detect(getcwd())|endif
|
||||||
autocmd BufWinLeave * execute getbufvar(+expand('<abuf>'), 'fugitive_restore')
|
autocmd BufWinLeave * execute getwinvar(+winnr(), 'fugitive_restore')
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
" }}}1
|
" }}}1
|
||||||
@@ -1199,12 +1199,12 @@ function! s:Blame(bang,line1,line2,count,args) abort
|
|||||||
call s:throw(join(readfile(error),"\n"))
|
call s:throw(join(readfile(error),"\n"))
|
||||||
endif
|
endif
|
||||||
let bufnr = bufnr('')
|
let bufnr = bufnr('')
|
||||||
let restore = 'call setbufvar('.bufnr.',"&scrollbind",0)'
|
let restore = 'call setwinvar(bufwinnr('.bufnr.'),"&scrollbind",0)'
|
||||||
if &l:wrap
|
if &l:wrap
|
||||||
let restore .= '|call setbufvar('.bufnr.',"&wrap",1)'
|
let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&wrap",1)'
|
||||||
endif
|
endif
|
||||||
if &l:foldenable
|
if &l:foldenable
|
||||||
let restore .= '|call setbufvar('.bufnr.',"&foldenable",1)'
|
let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&foldenable",1)'
|
||||||
endif
|
endif
|
||||||
let winnr = winnr()
|
let winnr = winnr()
|
||||||
windo set noscrollbind
|
windo set noscrollbind
|
||||||
@@ -1216,7 +1216,7 @@ function! s:Blame(bang,line1,line2,count,args) abort
|
|||||||
let b:git_dir = git_dir
|
let b:git_dir = git_dir
|
||||||
let b:fugitive_type = 'blame'
|
let b:fugitive_type = 'blame'
|
||||||
let b:fugitive_blamed_bufnr = bufnr
|
let b:fugitive_blamed_bufnr = bufnr
|
||||||
let b:fugitive_restore = restore
|
let w:fugitive_restore = restore
|
||||||
let b:fugitive_blame_arguments = join(a:args,' ')
|
let b:fugitive_blame_arguments = join(a:args,' ')
|
||||||
call s:Detect(expand('%:p'))
|
call s:Detect(expand('%:p'))
|
||||||
execute top
|
execute top
|
||||||
|
|||||||
Reference in New Issue
Block a user