vimrc: Allow running as root.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 04cae913b00a108a09a499a82e637a86eb08bb06..cd775e0a90335b1b9c638c5f97bd49edd331fe48 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.
@@ -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
 
 
@@ -389,14 +386,14 @@ endif
 " 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
+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 NERDCreateDefaultMappings = 0
+    let g:NERDCreateDefaultMappings = 0
 endif
 " Map toggle comment.
 map <Leader><Leader> <Plug>NERDCommenterToggle