From ff6388a27550c81a1912b2586ed52e21a2bbc9a9 Mon Sep 17 00:00:00 2001
From: alterdepp <alterdepp@eb2d0018-73a3-4aeb-bfe9-1def61c9ec69>
Date: Tue, 9 Oct 2012 08:27:50 +0000
Subject: [PATCH] use buildin 'diffoff' instead of 'DiffOff'

git-svn-id: https://vimsuite.svn.sourceforge.net/svnroot/vimsuite/trunk@219 eb2d0018-73a3-4aeb-bfe9-1def61c9ec69
---
 vimfiles.stefan/plugin/vimsuite.vim | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/vimfiles.stefan/plugin/vimsuite.vim b/vimfiles.stefan/plugin/vimsuite.vim
index 0579018..c2344f3 100644
--- a/vimfiles.stefan/plugin/vimsuite.vim
+++ b/vimfiles.stefan/plugin/vimsuite.vim
@@ -496,8 +496,8 @@ function s:RedrawMenu()
                 \'&Diff.&show\ diffs<tab>:diffthis'.
                 \'   :diffthis<CR>'
     exec 'anoremenu '.s:VimSuiteMenuLocation.'.60 '.s:VimSuiteMenuName.
-                \'&Diff.&end\ diffs<tab>:DiffOff'.
-                \'   :DiffOff<CR>'
+                \'&Diff.&end\ diffs<tab>:diffoff'.
+                \'   :diffoff<CR>'
     exec 'anoremenu '.s:VimSuiteMenuLocation.'.60 '.s:VimSuiteMenuName.
                 \'&Diff.&close\ diff<tab>:DiffClose'.
                 \'   :DiffClose<CR>'
@@ -921,21 +921,13 @@ endfunction
 " turn diff off
 command DiffClose call DiffClose()
 function DiffClose()
+    diffoff!
     :quit
-    call DiffOff()
-endfunction
-
-command DiffOff call DiffOff()
-function DiffOff()
-    setlocal nodiff
-    setlocal noscrollbind
-    setlocal foldcolumn=0
-    setlocal foldmethod=syntax
 endfunction
 
 " options for DirDiff
 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
 
 " options for Vimball