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

Conflicts:
	vimrc

diff --git a/vimrc b/vimrc
index 5bf4dc1d01ff006d29049b5c5dea5f9370eae7d2..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')
@@ -22,6 +14,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.
@@ -224,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
@@ -252,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
@@ -320,8 +313,8 @@ if has('mac') || filereadable('/Users/.localized')
 endif
 
 " Disable Apple style movements in MacVim.
-if has('gui_macvim') && has('eval')
-    let macvim_skip_cmd_opt_movement = 1
+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
@@ -375,12 +368,16 @@ 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