ld/amix-vimrc-mirror
1
0
Fork 0
mirror of https://github.com/amix/vimrc synced 2025-06-16 01:25:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated plugins

Browse Source
This commit is contained in:
amix
2014-01-07 00:25:41 +00:00
parent 2a0e2ddc13
commit b03dc8e510
12 changed files with 107 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sources_non_forked/vim-fugitive/plugin/fugitive.vim
View File

@ -1396,6 +1396,7 @@ function! s:diff_restore()
let restore = 'setlocal nodiff noscrollbind'
\ . ' scrollopt=' . &l:scrollopt
\ . (&l:wrap ? ' wrap' : ' nowrap')
\ . ' foldlevel=999'
\ . ' foldmethod=' . &l:foldmethod
\ . ' foldcolumn=' . &l:foldcolumn
\ . ' foldlevel=' . &l:foldlevel
@ -1499,14 +1500,14 @@ function! s:Diff(bang,...)
try
let spec = s:repo().translate(file)
let commit = matchstr(spec,'\C[^:/]//\zs\x\+')
let restore = s:diff_restore()
let w:fugitive_diff_restore = restore
if s:buffer().compare_age(commit) < 0
execute 'rightbelow '.vert.'split '.s:fnameescape(spec)
execute 'rightbelow '.vert.'diffsplit '.s:fnameescape(spec)
else
execute 'leftabove '.vert.'split '.s:fnameescape(spec)
execute 'leftabove '.vert.'diffsplit '.s:fnameescape(spec)
endif
call s:diffthis()
wincmd p
call s:diffthis()
let w:fugitive_diff_restore = restore
return ''
catch /^fugitive:/
return 'echoerr v:errmsg'