vimrc: Fix indentation.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index e209796979a08a4f66f23a6a80a387538415d569..5bf4dc1d01ff006d29049b5c5dea5f9370eae7d2 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -386,23 +386,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 has('eval') && 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')
+    " Don't create any mappings I don't want to use.
     let NERDCreateDefaultMappings = 0
-endif
-" Map toggle comment.
-map <Leader><Leader> <Plug>NERDCommenterToggle
+    " 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
@@ -498,12 +496,12 @@ if has('eval')
     " Thanks to
     " http://vim.wikia.com/index.php?title=Indent_text_object&oldid=27126
     " (visited on 2011-11-19).
-    onoremap <silent>ai :<C-u>call IndTxtObj(0)<CR>
-    onoremap <silent>ii :<C-u>call IndTxtObj(1)<CR>
-    vnoremap <silent>ai :<C-u>call IndTxtObj(0)<CR><Esc>gv
-    vnoremap <silent>ii :<C-u>call IndTxtObj(1)<CR><Esc>gv
+    onoremap <silent>ai :<C-U>call <SID>IndTxtObj(0)<CR>
+    onoremap <silent>ii :<C-U>call <SID>IndTxtObj(1)<CR>
+    vnoremap <silent>ai :<C-U>call <SID>IndTxtObj(0)<CR><Esc>gv
+    vnoremap <silent>ii :<C-U>call <SID>IndTxtObj(1)<CR><Esc>gv
 
-    function! IndTxtObj(inner)
+    function! s:IndTxtObj(inner)
         let curline = line(".")
         let lastline = line("$")
         let i = indent(line(".")) - &shiftwidth * (v:count1 - 1)