X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vimrc;h=e0b32985a97dc55725f81739576987702b045bec;hb=7ae608fc1103371b8fa72fb027fb8206c25e9a15;hp=88925276d9b817e00f52f7222470d70a860f8a5f;hpb=1c753e75b5766ac44ee48a6a67b2765103171d1d;p=dotfiles.git

diff --git a/.vimrc b/.vimrc
index 8892527..e0b3298 100644
--- a/.vimrc
+++ b/.vimrc
@@ -125,11 +125,17 @@ endif
 
 " 20 the swap file
 
+let myUndoDir = expand('~/tmp/vim/undo')
+if !isdirectory(myUndoDir)
+    " Create dirs
+    call mkdir(myUndoDir, 'p')
+endif
+
 " list of directories for the swap file; remove . (the current directory)
 if has("win32")
-   set directory=$TEMP//,c:/tmp//,c:/temp//
+   set directory=~/tmp/vim//,$TEMP//,c:/tmp//,c:/temp//
 else
-   set directory=~/tmp//,/var/tmp//,/tmp//
+   set directory=~/tmp/vim//,~/tmp//,/var/tmp//,/tmp//
 endif
 " if a directory ends in two path separators "//"
 " or "\\", the swap file name will be built from the complete path to
@@ -144,6 +150,12 @@ set wildignore+=*.py[co] " Ignore these patterns when completing file names
 set wildmenu      " command-line completion shows a list of matches
 set wildmode=longest,list:longest,full " Bash-vim completion behavior
 
+" Keep undo history across sessions by storing it in a file
+if has('persistent_undo')
+    let &undodir = myUndoDir
+    set undofile
+endif
+
 " 22 executing external commands
 
 if has("filterpipe")
@@ -272,7 +284,7 @@ if version >= 700
 " Save all files before running any quickfix command (grep, makeprg, etc.)
 autocmd QuickFixCmdPre * wall
 " automatically close quickfix if it's the only window left
-autocmd WinEnter * if winnr('$') == 1 && &buftype == "quickfix" | q | endif
+autocmd WinEnter * if winnr('$') == 1 && &buftype == "quickfix" | quit | endif
 endif
 
 " Syntax highlighting
@@ -527,6 +539,19 @@ if exists("$SLOWTERM")
 endif
 
 
+if has("python")
+python << END_OF_PYTHON
+import sys, os
+
+virtualenv_dir = os.environ.get('VIRTUAL_ENV')
+if virtualenv_dir:
+    sys.path.insert(0, virtualenv_dir)
+    activate_this = os.path.join(virtualenv_dir, 'bin', 'activate_this.py')
+    execfile(activate_this, dict(__file__=activate_this))
+END_OF_PYTHON
+endif
+
+
 " ----------
 " From http://slobin.pp.ru/vim/_vimrc.html