From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 25 Nov 2011 14:51:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'all-my-faults/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=ce07eb6aef6f148babfe9df43bde9d857c97ea3b;hp=-c;p=config%2Fdotfiles.git

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

Conflicts:
	vimrc
---

ce07eb6aef6f148babfe9df43bde9d857c97ea3b
diff --combined vimrc
index 5bf4dc1,c3a85eb..181ceb0
--- a/vimrc
+++ b/vimrc
@@@ -3,14 -3,6 +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 +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 +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 +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 +313,8 @@@ if has('mac') || filereadable('/Users/.
  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,32 -368,38 +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 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