X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=92946926b425c70308aa2105be2cb36221a56c28;hb=3fb48422ab22ba6c60c7db059c1f3cbb77b94142;hp=e209796979a08a4f66f23a6a80a387538415d569;hpb=1c420fe0d57fd9e8bfbe59ab3fccca48f2f9ae2b;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index e209796..9294692 100644
--- a/vimrc
+++ b/vimrc
@@ -22,6 +22,7 @@ set all&
 " And restore it after all other options were reset.
 if has('eval')
     let &runtimepath = s:save_runtimepath
+    unlet s:save_runtimepath
 endif
 
 " Make sure Vim (and not Vi) settings are used.
@@ -321,7 +322,7 @@ endif
 
 " Disable Apple style movements in MacVim.
 if has('gui_macvim') && has('eval')
-    let macvim_skip_cmd_opt_movement = 1
+    let g:macvim_skip_cmd_opt_movement = 1
 endif
 
 " In case 'hlsearch' is used disable it with <C-L>. Thanks to frogonwheels and
@@ -396,7 +397,7 @@ endif
 " Settings for the NERD commenter.
 " Don't create any mappings I don't want to use.
 if has('eval')
-    let NERDCreateDefaultMappings = 0
+    let g:NERDCreateDefaultMappings = 0
 endif
 " Map toggle comment.
 map <Leader><Leader> <Plug>NERDCommenterToggle
@@ -498,12 +499,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)