Merge pull request 55 from bling

Closes #55.
This commit is contained in:
Marco Hinz 2013-08-19 20:28:26 +02:00
commit fcb3fc5ded

View File

@ -8,15 +8,6 @@ let b:autoloaded_sy_repo = 1
" Init: values {{{1 " Init: values {{{1
if !empty(get(g:, 'signify_difftool')) if !empty(get(g:, 'signify_difftool'))
let s:difftool = g:signify_difftool let s:difftool = g:signify_difftool
else
if has('win32')
if $VIMRUNTIME =~ ' '
let s:difftool = (&sh =~ '\<cmd')
\ ? ('"'. $VIMRUNTIME .'\diff"')
\ : (substitute($VIMRUNTIME, ' ', '" ', '') .'\diff"')
else
let s:difftool = $VIMRUNTIME .'\diff'
endif
else else
if !executable('diff') if !executable('diff')
echomsg 'signify: No diff tool found!' echomsg 'signify: No diff tool found!'
@ -24,7 +15,6 @@ else
endif endif
let s:difftool = 'diff' let s:difftool = 'diff'
endif endif
endif
let s:diffoptions = get(g:, 'signify_diffoptions', {}) let s:diffoptions = get(g:, 'signify_diffoptions', {})