vimrc: Minor cleanup for variables.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 4b4e03cce905baa65271756daffa7376caaeef0b..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
@@ -363,6 +364,14 @@ if has('syntax')
         for x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED']
             call matchadd('Todo', x)
         endfor
+
+" Highlight unicode whitespace which is no normal whitespace (0x20).
+        for 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)
+        endfor
     endif
 
 " Settings for specific filetypes.
@@ -388,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
@@ -411,6 +420,7 @@ endif
 " twice.
 if has('autocmd')
     augroup vimrc
+" Remove all autocmds from the current group.
         autocmd!
 
 " Go to last position of opened files. Taken from :help last-position-jump.
@@ -435,10 +445,13 @@ if has('autocmd')
 " Automatically disable 'paste' mode when leaving insert mode. Thanks to
 " Raimondi in #vim on Freenode (2010-08-14 23:01 CEST). Very useful as I only
 " want to paste once and then 'paste' gets automatically unset.
-        if exists('#InsertLeave')
+        if exists('##InsertLeave')
             autocmd InsertLeave * set nopaste
         endif
 
+" Save changes when running :mak[e] before 'makeprg' is called.
+        autocmd QuickFixCmdPre * write
+
 " AFTER/FTPLUGIN AUTO COMMANDS
 
 " Disable spell checking for files which don't need it.
@@ -456,6 +469,8 @@ if has('autocmd')
                                  \ setlocal textwidth=72
 " Use the same comment string as for Vim files in Vimperator files.
         autocmd FileType vimperator setlocal commentstring=\"%s
+" Use tex compiler for (La)TeX files.
+        autocmd FileType tex compiler tex
 
 " FTDETECT AUTO COMMANDS
 
@@ -475,3 +490,52 @@ if has('autocmd')
 
     augroup END
 endif
+
+
+" CUSTOM FUNCTIONS
+
+if has('eval')
+    " New text-objects ii and ai to work on text with the same indentation.
+    " 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 <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! s:IndTxtObj(inner)
+        let curline = line(".")
+        let lastline = line("$")
+        let i = indent(line(".")) - &shiftwidth * (v:count1 - 1)
+        let i = i < 0 ? 0 : i
+        if getline(".") !~ "^\\s*$"
+            let p = line(".") - 1
+            let nextblank = getline(p) =~ "^\\s*$"
+            while p > 0
+                    \ && ((i == 0 && !nextblank)
+                        \ || (i > 0 && ((indent(p) >= i
+                            \ && !(nextblank && a:inner))
+                            \ || (nextblank && !a:inner))))
+                -
+                let p = line(".") - 1
+                let nextblank = getline(p) =~ "^\\s*$"
+            endwhile
+            normal! 0V
+            call cursor(curline, 0)
+            let p = line(".") + 1
+            let nextblank = getline(p) =~ "^\\s*$"
+            while p <= lastline
+                    \ && ((i == 0 && !nextblank)
+                        \ || (i > 0 && ((indent(p) >= i
+                            \ && !(nextblank && a:inner))
+                            \ || (nextblank && !a:inner))))
+                +
+                let p = line(".") + 1
+                let nextblank = getline(p) =~ "^\\s*$"
+            endwhile
+            normal! $
+        endif
+    endfunction
+
+endif