vimrc: Minor cleanup for variables.

diff --git a/vimrc b/vimrc
index 04cae913b00a108a09a499a82e637a86eb08bb06..92946926b425c70308aa2105be2cb36221a56c28 100644 (file)
--- 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