Merge commit 'rammstein/master'

Conflicts:

	vimrc

diff --combined vimrc
index b200fa4b63a2710da59db4995b0993cff65a8b47,7d8ebf35f983f408c538fcfee99dcf48cc25dede..95318fec57a3b4afa93f880a4193cf6b214a729d
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -28,13 -28,12 +28,13 @@@ endi
  " EDIT SETTINGS
  
  " Enable automatic file detection, plugin and indention.
 -if has("autocmd")
 +if has('autocmd')
      filetype plugin indent on
  endif
  
 -" Use UTF-8 file encoding for all files.
 -set fileencodings=utf-8
 +" Use UTF-8 file encoding for all files. Automatically recognize latin1 in
 +" existing files.
 +set fileencodings=utf-8,latin1
  
  " Wrap text after 78 characters.
  set textwidth=78
@@@ -73,7 -72,7 +73,7 @@@ set virtualedit=bloc
  set incsearch
  
  " Activate syntax folding.
 -if has("folding")
 +if has('folding')
      set foldmethod=syntax
      set foldcolumn=2
      set foldlevel=99 " no closed folds at default, 'foldenable' would disable
@@@ -174,13 -173,14 +174,14 @@@ els
  endif
  
  " Make sure xa0 (alt + space) is automatically changed to a normal whitespace
- " if pressed accidentally while in insert mode (happens on Mac sometimes).
+ " if pressed accidentally while in insert mode (happens on Mac when alt
+ " doesn't send escape).
 -if has("mac")
 +if has('mac')
      imap <Char-0xa0> <Space>
  endif
  
  " Disable Apple style movements in MacVim.
 -if has("gui_macvim") && has("eval")
 +if has('gui_macvim') && has('eval')
      let macvim_skip_cmd_opt_movement = 1
  endif
  
@@@ -188,7 -188,7 +189,7 @@@
  " SYNTAX SETTINGS
  
  " Activate syntax coloring.
 -if has("syntax")
 +if has('syntax')
      syntax enable
  
  " Highlight text longer then 78 characters. Thanks to Tony Mechelynck
@@@ -205,7 -205,7 +206,7 @@@ endi
  
  " Settings for the NERD commenter.
  " Don't create any mappings I don't want to use.
 -if has("eval")
 +if has('eval')
      let NERDCreateDefaultMappings = 0
  endif
  " Map toggle comment.
@@@ -216,7 -216,7 +217,7 @@@ map <Leader><Leader> <plug>NERDCommente
  
  " Use a custom auto group to prevent problems when the vimrc files is sourced
  " twice.
 -if has("autocmd")
 +if has('autocmd')
      augroup vimrc
          autocmd!