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

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index c3a85eb20042b900e658becc8ca0d7e0b2e71469..181ceb0626b5a4d006a9bf7b9394ea0c385efef2 100644 (file)
--- 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