Merge commit 'rammstein/master'

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 8b44898443ff757d432f04f9ae57400d4dc23023..95318fec57a3b4afa93f880a4193cf6b214a729d 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -32,8 +32,9 @@ 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
@@ -173,7 +174,8 @@ else
 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')
     imap <Char-0xa0> <Space>
 endif