vimrc: Use local variables when possible.

diff --git a/vimrc b/vimrc
index bf94896e63485c3890fff7a26eb902392222bac9..86a6cc9f908045740ad5d70275927b47bc9ca88e 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -277,10 +277,10 @@ nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
 " and all nerds involved (godlygeek, strull in #vim on Freenode).
 if has('eval')
     function! s:VSetSearch()
-        let temp = @@
+        let l:temp = @@
         normal! gvy
         let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
-        let @@ = temp
+        let @@ = l:temp
     endfunction
     vnoremap * :<C-U>call <SID>VSetSearch()<CR>//<CR>
     vnoremap # :<C-U>call <SID>VSetSearch()<CR>??<CR>
@@ -419,16 +419,16 @@ if has('syntax')
 
     if exists('*matchadd')
 " Highlight some important keywords in all documents.
-        for x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED']
-            call matchadd('Todo', x)
+        for s:x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED']
+            call matchadd('Todo', s:x)
         endfor
 
 " Highlight unicode whitespace which is no normal whitespace (0x20).
-        for x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003',
+        for s:x in ['00a0', '1680', '180e', '2000', '2001', '2002', '2003',
                 \ '2004', '2005', '2006', '2007', '2008', '2009', '200a',
                 \ '200b', '200c', '200d', '202f', '205f', '2060', '3000',
                 \ 'feff']
-            call matchadd('Error', '\%u' . x)
+            call matchadd('Error', '\%u' . s:x)
         endfor
     endif
 
@@ -459,7 +459,7 @@ if has('eval')
 
 " Settings for the NERD commenter.
     " Don't create any mappings I don't want to use.
-    let NERDCreateDefaultMappings = 0
+    let g:NERDCreateDefaultMappings = 0
     " Map toggle comment.
     map <Leader><Leader> <Plug>NERDCommenterToggle