From 4eea06e04a0ed57493eed151b043576f5e10ba81 Mon Sep 17 00:00:00 2001
From: AlterDepp <AlterDepp@eb2d0018-73a3-4aeb-bfe9-1def61c9ec69>
Date: Mon, 26 Sep 2011 13:42:46 +0000
Subject: [PATCH] Bugfix python DirDiff, Completion

git-svn-id: https://vimsuite.svn.sourceforge.net/svnroot/vimsuite/trunk@211 eb2d0018-73a3-4aeb-bfe9-1def61c9ec69
---
 vimfiles.stefan/plugin/python.vim   | 104 ++++++++++++----------------
 vimfiles.stefan/plugin/vimsuite.vim |   2 +-
 vimfiles.stefan/vimrc               |  11 +++
 vimfiles.stefan/vimrc.bmsk          |   4 +-
 vimfiles.stefan/vimrc.dos           |   2 +-
 5 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/vimfiles.stefan/plugin/python.vim b/vimfiles.stefan/plugin/python.vim
index f586956..2fa9937 100644
--- a/vimfiles.stefan/plugin/python.vim
+++ b/vimfiles.stefan/plugin/python.vim
@@ -8,70 +8,58 @@ if !has('win32')
     finish
 endif
 
-if !has('python')
-    " noch keine python.dll gefunden
-        " tools zum Suchpfad hinzufügen
-        if (match($PATH, '\c' . escape(g:vimtools, '\')) >= 0)
-            " ist schon drin, abbrechen
-            echo 'keine python.dll in g:vimtools=' . g:vimtools . ' gefunden'
+if exists('g:pythonPath')
+    if !has('python')
+        " keine python.dll gefunden
+        if !isdirectory(g:pythonPath)
+            echo 'g:pythonPath=' . g:pythonPath . ' nicht gefunden'
             finish
         else
-            " bei Bedarf ';' an PATH anhängen
-            if (match($PATH, ';$') < 0)
-                let $PATH = $PATH . ';'
+            " pythonPath zum Suchpfad hinzufügen
+            let PATH = $PATH
+            if (match(PATH, '\c' . escape(g:pythonPath, '\')) >= 0)
+                " ist schon drin, abbrechen
+                echo 'kein python.exe in g:pythonPath=' . g:pythonPath . ' gefunden'
+                finish
+            else
+                " bei Bedarf ';' an PATH anhängen
+                if (match(PATH, ';$') < 0)
+                    let PATH = PATH . ';'
+                endif
+                let PATH = PATH . g:pythonPath
+                "echo 'Python = ' . g:pythonPath
+                "echo 'PATH:' PATH
+                let $PATH = PATH
             endif
-            let $PATH = $PATH . g:vimtools . ';'
-            "echo 'Python = ' . g:vimtools
-        endif
-endif
-
-if !has('python')
-    " immer noch keine python.dll gefunden
-    if !isdirectory(g:pythonPath)
-        echo 'g:pythonPath=' . g:pythonPath . ' nicht gefunden'
-        finish
-    else
-        " pythonPath zum Suchpfad hinzufügen
-        if (match($PATH, '\c' . escape(g:pythonPath, '\')) >= 0)
-            " ist schon drin, abbrechen
-            echo 'kein python.exe in g:pythonPath=' . g:pythonPath . ' gefunden'
-            finish
-        else
-            " bei Bedarf ';' an PATH anhängen
-            if (match($PATH, ';$') < 0)
-                let $PATH = $PATH . ';'
-            endif
-            let $PATH = $PATH . g:pythonPath . ';'
-            "echo 'Python = ' . g:pythonPath
         endif
     endif
+
+    " Jetzt sollte es eigentlich gehen
+    if !has('python')
+        echoe 'kein Python-Modul für vim'
+        finish
+    endif
+
+    let s:pythonLibPath = expand(g:pythonPath . '/lib')
+    let s:pythonDllPath = expand(g:pythonPath . '/dlls')
 endif
 
-" Jetzt sollte es eigentlich gehen
-if !has('python')
-    echoe 'kein Python-Modul für vim'
-    finish
-endif
-
-let s:pythonLibPath = expand(g:pythonPath . '/lib')
-let s:pythonDllPath = expand(g:pythonPath . '/dlls')
-
-try
-python <<EOF
-import sys
-#print sys.version
-import vim
-sys.path.append(vim.eval('s:pythonLibPath'))
-sys.path.append(vim.eval('s:pythonDllPath'))
-EOF
-catch /^Vim\%((\a\+)\)\=:E370/	" python not available
-    echo 'python not found'
-    echo 'add python to your path-variable'
-    echo 'otherwise some features from MyTools are not available'
-catch /^Vim\%((\a\+)\)\=:E263/	" python not available
-    echo 'python not found 2'
-catch
-    echo 'python.vim: irgendwas geht nicht'
-endtry
+"try
+"python <<EOF
+"import sys
+"#print sys.version
+"import vim
+"sys.path.append(vim.eval('s:pythonLibPath'))
+"sys.path.append(vim.eval('s:pythonDllPath'))
+"EOF
+"catch /^Vim\%((\a\+)\)\=:E370/	" python not available
+"    echo 'python not found'
+"    echo 'add python to your path-variable'
+"    echo 'otherwise some features from MyTools are not available'
+"catch /^Vim\%((\a\+)\)\=:E263/	" python not available
+"    echo 'python not found 2'
+"catch
+"    echo 'python.vim: irgendwas geht nicht'
+"endtry
 
 EchoDebug 'loaded python.vim'
diff --git a/vimfiles.stefan/plugin/vimsuite.vim b/vimfiles.stefan/plugin/vimsuite.vim
index 9fe32c1..a506470 100644
--- a/vimfiles.stefan/plugin/vimsuite.vim
+++ b/vimfiles.stefan/plugin/vimsuite.vim
@@ -930,7 +930,7 @@ endfunction
 
 " options for DirDiff
 let g:DirDiffCommand = expand($VIMRUNTIME . '/diff')
-let g:DirDiffExcludes = '*.log,*.pyc,.svn,_ccmwaid.inf,.static_wa,out,tags,cscope.out'
+let g:DirDiffExcludes = '*.log,*.pyc,.svn,.asc,_ccmwaid.inf,.static_wa,out,Build,tags,cscope.out'
 "let g:DirDiffDynamicDiffText = 1
 
 " options for Vimball
diff --git a/vimfiles.stefan/vimrc b/vimfiles.stefan/vimrc
index 1fee401..83ffac3 100644
--- a/vimfiles.stefan/vimrc
+++ b/vimfiles.stefan/vimrc
@@ -186,6 +186,17 @@ if exists('g:debug')
     endif
 endif
 
+" ----------
+" Completion
+" ----------
+set completeopt=longest,menuone
+inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+inoremap <expr> <C-n> pumvisible() ? '<C-n>' :
+  \ '<C-n><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>'
+inoremap <expr> <M-,> pumvisible() ? '<C-n>' :
+  \ '<C-x><C-o><C-n><C-p><C-r>=pumvisible() ? "\<lt>Down>" : ""<CR>'
+
+
 " --------------
 " DoxygenToolkit
 " --------------
diff --git a/vimfiles.stefan/vimrc.bmsk b/vimfiles.stefan/vimrc.bmsk
index bd5625e..d16448c 100644
--- a/vimfiles.stefan/vimrc.bmsk
+++ b/vimfiles.stefan/vimrc.bmsk
@@ -1,6 +1,6 @@
 let g:Austausch   = expand('//easerv.muc/Organisation/ea-41/Austausch')
 let g:myAustausch = expand(g:Austausch . '/Liebl')
-let g:bmskWA      = expand('d:/wa')
-let g:WA          = expand('d:/wa')
+let g:bmskWA      = expand('c:/wa')
+let g:WA          = expand('c:/wa')
 let g:ccm         = expand('c:/ec-apps/cmsynergy/ccm64/bin/ccm.exe')
 
diff --git a/vimfiles.stefan/vimrc.dos b/vimfiles.stefan/vimrc.dos
index e60c39e..1d4dcdd 100644
--- a/vimfiles.stefan/vimrc.dos
+++ b/vimfiles.stefan/vimrc.dos
@@ -5,7 +5,7 @@ let g:backupdir   = expand($TEMP . '/vi')
 let g:swapdir     = expand($TEMP . '/vi')
 
 let g:gvim        = expand($VIMRUNTIME . '/gvim.exe ')
-let g:pythonPath  = expand('d:/wa/tools/python/2.7.1')
+"let g:pythonPath  = expand('c:/wa/tools/python/2.7.1')
 let g:diff        = expand($VIMRUNTIME . '/diff ')
 let g:svn         = expand('svn ')
 let g:cvs         = expand('cvs ')