X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=c3a85eb20042b900e658becc8ca0d7e0b2e71469;hb=b122832efa953ed888415f7a3959d4cbeae6e265;hp=e209796979a08a4f66f23a6a80a387538415d569;hpb=1c420fe0d57fd9e8bfbe59ab3fccca48f2f9ae2b;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index e209796..c3a85eb 100644
--- 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
 
 
@@ -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
@@ -498,12 +495,12 @@ 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 IndTxtObj(0)<CR>
-    onoremap <silent>ii :<C-u>call IndTxtObj(1)<CR>
-    vnoremap <silent>ai :<C-u>call IndTxtObj(0)<CR><Esc>gv
-    vnoremap <silent>ii :<C-u>call 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! IndTxtObj(inner)
+    function! s:IndTxtObj(inner)
         let curline = line(".")
         let lastline = line("$")
         let i = indent(line(".")) - &shiftwidth * (v:count1 - 1)