use buildin 'diffoff' instead of 'DiffOff'
git-svn-id: https://vimsuite.svn.sourceforge.net/svnroot/vimsuite/trunk@219 eb2d0018-73a3-4aeb-bfe9-1def61c9ec69
This commit is contained in:
parent
a2a9daa90b
commit
ff6388a275
@ -496,8 +496,8 @@ function s:RedrawMenu()
|
|||||||
\'&Diff.&show\ diffs<tab>:diffthis'.
|
\'&Diff.&show\ diffs<tab>:diffthis'.
|
||||||
\' :diffthis<CR>'
|
\' :diffthis<CR>'
|
||||||
exec 'anoremenu '.s:VimSuiteMenuLocation.'.60 '.s:VimSuiteMenuName.
|
exec 'anoremenu '.s:VimSuiteMenuLocation.'.60 '.s:VimSuiteMenuName.
|
||||||
\'&Diff.&end\ diffs<tab>:DiffOff'.
|
\'&Diff.&end\ diffs<tab>:diffoff'.
|
||||||
\' :DiffOff<CR>'
|
\' :diffoff<CR>'
|
||||||
exec 'anoremenu '.s:VimSuiteMenuLocation.'.60 '.s:VimSuiteMenuName.
|
exec 'anoremenu '.s:VimSuiteMenuLocation.'.60 '.s:VimSuiteMenuName.
|
||||||
\'&Diff.&close\ diff<tab>:DiffClose'.
|
\'&Diff.&close\ diff<tab>:DiffClose'.
|
||||||
\' :DiffClose<CR>'
|
\' :DiffClose<CR>'
|
||||||
@ -921,21 +921,13 @@ endfunction
|
|||||||
" turn diff off
|
" turn diff off
|
||||||
command DiffClose call DiffClose()
|
command DiffClose call DiffClose()
|
||||||
function DiffClose()
|
function DiffClose()
|
||||||
|
diffoff!
|
||||||
:quit
|
:quit
|
||||||
call DiffOff()
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
command DiffOff call DiffOff()
|
|
||||||
function DiffOff()
|
|
||||||
setlocal nodiff
|
|
||||||
setlocal noscrollbind
|
|
||||||
setlocal foldcolumn=0
|
|
||||||
setlocal foldmethod=syntax
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
" options for DirDiff
|
" options for DirDiff
|
||||||
let g:DirDiffCommand = expand($VIMRUNTIME . '/diff')
|
let g:DirDiffCommand = expand($VIMRUNTIME . '/diff')
|
||||||
let g:DirDiffExcludes = '*.log,*.pyc,.svn,.asc,_ccmwaid.inf,.static_wa,out,Build,tags,cscope.out'
|
let g:DirDiffExcludes = '*.log,*.pyc,.svn,.git*,.asc,_ccmwaid.inf,.static_wa,out,Build,tags,cscope.out'
|
||||||
"let g:DirDiffDynamicDiffText = 1
|
"let g:DirDiffDynamicDiffText = 1
|
||||||
|
|
||||||
" options for Vimball
|
" options for Vimball
|
||||||
|
Loading…
x
Reference in New Issue
Block a user