Merge remote-tracking branch 'all-my-faults/master'

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 92946926b425c70308aa2105be2cb36221a56c28..181ceb0626b5a4d006a9bf7b9394ea0c385efef2 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -3,14 +3,6 @@
 
 " 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.
 if has('eval')
@@ -225,7 +217,7 @@ 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>.
+" 20:02 CEST). To suspend without saving either unmap this or use :stop<CR>.
 nnoremap <C-Z> :update<CR>:stop<CR>
 
 " 2<C-G> gives more verbose information, use it by default. Thanks to NCS_One
@@ -253,7 +245,7 @@ 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.
+" 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
@@ -321,7 +313,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 +368,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