X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=28803a1330197303f73ec91747ed7ea8688ef231;hb=4caa8a862f391d16f905ee1c286495d82b0879e6;hp=bf94896e63485c3890fff7a26eb902392222bac9;hpb=669c65e2be773dc0138879774637b2a6830b2ca6;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index bf94896..28803a1 100644
--- 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>
@@ -315,19 +315,6 @@ else
         \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'qa' : 'Qa')
 endif
 
-" Make sure xa0 (alt + space) is automatically changed to a normal whitespace
-" if pressed accidentally while in insert mode (happens on Mac when alt
-" doesn't send escape). filereadable() is necessary for Leopard were 'mac' is
-" no longer set on the console.
-if has('mac') || filereadable('/Users/.localized')
-    inoremap <Char-0xa0> <Space>
-endif
-
-" Disable Apple style movements in MacVim.
-if has('gui_macvim')
-    let g:macvim_skip_cmd_opt_movement = 1
-endif
-
 " In case 'hlsearch' is used disable it with <C-L>. Thanks to frogonwheels and
 " vimgor (bot) in #vim on Freenode (2010-03-30 05:58 CEST).
 noremap <silent> <C-L> :nohlsearch<CR><C-L>
@@ -419,16 +406,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 +446,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