vimrc: Really disable spell checking when diffing.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 92946926b425c70308aa2105be2cb36221a56c28..04d26cab126f38003c941f6075b028d1ea73397a 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -3,18 +3,13 @@
 
 " EDITOR SETTINGS
 
-" Prevent editing as root as it may cause security problems. Use sudoedit
-" instead. Thanks to godlygeek in #vim on Freenode (2009-06-19 22:21 CEST).
-if $HOME == '/root' || exists('$SUDO_USER')
-    echomsg 'Running as root is forbidden! Use sudoedit.'
-    qall
-endif
-
-
 " Save 'runtimepath' in case it was changed by the system's configuration
-" files.
+" files. Also save 'diff' as set all& resets it; but somehow later (after
+" sourcing the vimrc - for example in a VimEnter autocmd) it gets
+" automagically restored to the correct value.
 if has('eval')
     let s:save_runtimepath = &runtimepath
+    let s:save_diff = &diff
 endif
 " Reset all options (except 'term', 'lines' and 'columns'). This makes sure a
 " system wide configuration file doesn't change default values.
@@ -22,7 +17,9 @@ set all&
 " And restore it after all other options were reset.
 if has('eval')
     let &runtimepath = s:save_runtimepath
+    let &diff = s:save_diff
     unlet s:save_runtimepath
+    unlet s:save_diff
 endif
 
 " Make sure Vim (and not Vi) settings are used.
@@ -119,10 +116,12 @@ endif
 set ignorecase
 set smartcase
 
-" Activate spell checking, use English as default. Don't use spell checking
-" when diffing.
-if exists('+spell') && has('syntax') && !&diff
-    set spell
+" Activate spell checking, use English as default.
+if exists('+spell') && has('syntax')
+    " But not when diffing as spell checking is distracting in this case.
+    if !&diff
+        set spell
+    endif
     set spelllang=en_us
 endif
 
@@ -225,8 +224,8 @@ cnoremap <C-P> <Up>
 cnoremap <C-N> <Down>
 
 " Write before suspending, thanks to deryni in #vim on Freenode (2011-05-09
-" 20:02 CEST). To suspend without saving either unmap it or use :stop<CR>.
-nnoremap <C-Z> :update<CR>:stop<CR>
+" 20:02 CEST). To suspend without saving either unmap this or use :stop<CR>.
+nnoremap <silent> <C-Z> :update<CR>:stop<CR>
 
 " 2<C-G> gives more verbose information, use it by default. Thanks to NCS_One
 " in #vim on Freenode (2011-08-15 00:17 CEST).
@@ -242,26 +241,26 @@ nnoremap <silent> gb :bnext<CR>
 nnoremap <silent> gB :bprev<CR>
 
 " Fast access to buffers.
-nnoremap <Leader>1 :1b<CR>
-nnoremap <Leader>2 :2b<CR>
-nnoremap <Leader>3 :3b<CR>
-nnoremap <Leader>4 :4b<CR>
-nnoremap <Leader>5 :5b<CR>
-nnoremap <Leader>6 :6b<CR>
-nnoremap <Leader>7 :7b<CR>
-nnoremap <Leader>8 :8b<CR>
-nnoremap <Leader>9 :9b<CR>
-nnoremap <Leader>0 :10b<CR>
-
-" Make last active window the only window. Similar to <C-w> o.
+nnoremap <silent> <Leader>1 :1b<CR>
+nnoremap <silent> <Leader>2 :2b<CR>
+nnoremap <silent> <Leader>3 :3b<CR>
+nnoremap <silent> <Leader>4 :4b<CR>
+nnoremap <silent> <Leader>5 :5b<CR>
+nnoremap <silent> <Leader>6 :6b<CR>
+nnoremap <silent> <Leader>7 :7b<CR>
+nnoremap <silent> <Leader>8 :8b<CR>
+nnoremap <silent> <Leader>9 :9b<CR>
+nnoremap <silent> <Leader>0 :10b<CR>
+
+" Make last active window the only window. Similar to <C-W> o.
 nnoremap <C-W>O <C-W>p<C-W>o
 
 " Maps to change spell language between English and German and disable spell
 " checking.
 if exists('+spell')
-    noremap <Leader>sn :set nospell<CR>
-    noremap <Leader>se :set spell spelllang=en_us<CR>
-    noremap <Leader>sd :set spell spelllang=de_de<CR>
+    noremap <silent> <Leader>sn :set nospell<CR>
+    noremap <silent> <Leader>se :set spell spelllang=en_us<CR>
+    noremap <silent> <Leader>sd :set spell spelllang=de_de<CR>
 endif
 
 " Add semicolon to the end of the line. Thanks to
@@ -321,7 +320,7 @@ if has('mac') || filereadable('/Users/.localized')
 endif
 
 " Disable Apple style movements in MacVim.
-if has('gui_macvim') && has('eval')
+if has('gui_macvim')
     let g:macvim_skip_cmd_opt_movement = 1
 endif
 
@@ -376,34 +375,36 @@ if has('syntax')
 
 " Settings for specific filetypes.
 
+    " Haskell.
+    let g:hs_highlight_boolean = 1
+    let g:hs_highlight_types = 1
+    let g:hs_highlight_more_types = 1
+
     " Perl.
     let g:perl_fold = 1
     let g:perl_fold_blocks = 1
     let g:perl_nofold_packages = 1
     let g:perl_include_pod = 1 " syntax coloring for PODs
-
 endif
 
 
 " PLUGIN SETTINGS
 
+if has('eval')
 " Use pathogen which allows one 'runtimepath' entry per plugin. This makes
 " installing/removing/updating plugins simple. (Used for plugins with more
 " than one file.)
-if has('eval') && v:version >= 700
-    execute 'call pathogen#runtime_append_all_bundles()'
-endif
+    if v:version >= 700
+        execute 'call pathogen#runtime_append_all_bundles()'
+    endif
 
 " Settings for the NERD commenter.
-" Don't create any mappings I don't want to use.
-if has('eval')
-    let g:NERDCreateDefaultMappings = 0
-endif
-" Map toggle comment.
-map <Leader><Leader> <Plug>NERDCommenterToggle
+    " Don't create any mappings I don't want to use.
+    let NERDCreateDefaultMappings = 0
+    " Map toggle comment.
+    map <Leader><Leader> <Plug>NERDCommenterToggle
 
 " XPTemplate settings.
-if has('eval')
     " Try to maintain snippet rendering even after editing outside of a
     " snippet.
     let g:xptemplate_strict = 0
@@ -499,10 +500,10 @@ 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 <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
+    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(".")