vimrc: Use pathogen#infect() available since 2.0.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 41dd8124b00fe1846168383d45a8b32f7f11cad7..3a48b1e0d4fad2dbfe32059eea07fa29ff907577 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -49,8 +49,11 @@ set encoding=utf-8
 set runtimepath-=~/.vim
 set runtimepath^=~/.vim,~/.vim/runtime
 
-" Don't store swap files in the same directory as the edited file.
-set directory-=.
+" Don't store swap files in the same directory as the edited file. But only if
+" we have a "safe" writable directory available.
+if filewritable('~/.tmp') == 2 || filewritable('~/tmp') == 2
+    set directory-=.
+endif
 " But store them in ~/.tmp or ~/tmp (already set by default) if available.
 set directory^=~/.tmp
 
@@ -90,9 +93,9 @@ endif
 
 " HELPER FUNCTIONS
 
+if has('eval')
 " Check if the given syntax group is available. Thanks to bairui in #vim on
 " Freenode (2012-02-19 01:15 CET) for the try/catch silent highlight idea.
-if has('eval')
     function! s:HasSyntaxGroup(group)
         try
             execute 'silent highlight ' . a:group
@@ -102,6 +105,12 @@ if has('eval')
         endtry
         return 1
     endfunction
+
+" Check if the given Vim version and patch is available.
+    function! s:HasVersionAndPatch(version, patch)
+        return v:version > a:version
+            \ || (v:version == a:version && has('patch' . a:patch))
+    endfunction
 endif
 
 
@@ -117,6 +126,9 @@ endif
 " existing files.
 set fileencodings=utf-8,latin1
 
+" Always use unix line-endings for new files.
+set fileformats=unix,dos
+
 " Wrap text after 78 characters.
 set textwidth=78
 
@@ -144,6 +156,10 @@ set formatoptions+=ro
 " Don't break a line if was already longer then 'textwidth' when insert mode
 " started.
 set formatoptions+=l
+" Remove comment leader when joining lines where it makes sense.
+if <SID>HasVersionAndPatch(703, 541)
+    set formatoptions+=j
+endif
 
 " Allow virtual editing (cursor can be positioned anywhere, even when there is
 " no character) in visual block mode.
@@ -191,7 +207,7 @@ set hidden
 set background=dark
 
 " Use my color scheme if 256 colors are available.
-if &t_Co == 256
+if &t_Co == 256 || has('gui_running')
     colorscheme simon
 endif
 
@@ -732,7 +748,7 @@ if has('eval')
 " installing/removing/updating plugins simple. (Used for plugins with more
 " than one file.) Ignore errors in case pathogen is not installed.
     if v:version >= 700
-        silent! execute 'call pathogen#runtime_append_all_bundles()'
+        silent! execute 'call pathogen#infect()'
     endif
 
 " Settings for securemodelines.