From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 25 Nov 2011 14:51:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'all-my-faults/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=ce07eb6aef6f148babfe9df43bde9d857c97ea3b;hp=b122832efa953ed888415f7a3959d4cbeae6e265;p=config%2Fdotfiles.git

Merge remote-tracking branch 'all-my-faults/master'

Conflicts:
	vimrc
---

diff --git a/vimrc b/vimrc
index c3a85eb..181ceb0 100644
--- a/vimrc
+++ b/vimrc
@@ -383,23 +383,21 @@ endif
 
 " PLUGIN SETTINGS
 
+if has('eval')
 " Use pathogen which allows one 'runtimepath' entry per plugin. This makes
 " installing/removing/updating plugins simple. (Used for plugins with more
 " than one file.)
-if v:version >= 700
-    execute 'call pathogen#runtime_append_all_bundles()'
-endif
+    if v:version >= 700
+        execute 'call pathogen#runtime_append_all_bundles()'
+    endif
 
 " Settings for the NERD commenter.
-" Don't create any mappings I don't want to use.
-if has('eval')
-    let g:NERDCreateDefaultMappings = 0
-endif
-" Map toggle comment.
-map <Leader><Leader> <Plug>NERDCommenterToggle
+    " Don't create any mappings I don't want to use.
+    let NERDCreateDefaultMappings = 0
+    " Map toggle comment.
+    map <Leader><Leader> <Plug>NERDCommenterToggle
 
 " XPTemplate settings.
-if has('eval')
     " Try to maintain snippet rendering even after editing outside of a
     " snippet.
     let g:xptemplate_strict = 0