Merge commit 'rammstein/master'

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index de7dc05c18d5276e0781b0d6ecf7bbd054fc85a0..95318fec57a3b4afa93f880a4193cf6b214a729d 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -11,6 +11,10 @@ set nocompatible
 set runtimepath-=~/.vim
 set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime
 
+" Disable modelines as they may cause security problems. Instead use
+" securemodelines (Vim script #1876).
+set nomodeline
+
 " When completing paths first use the longest path then display a list of all
 " possible files.
 set wildmode=longest,list
@@ -24,12 +28,13 @@ endif
 " 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
@@ -64,11 +69,11 @@ set formatoptions+=l
 set virtualedit=block
 
 " Already display matches while typing the search command. This makes spotting
-" errors easily.
+" errors easy.
 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
@@ -169,13 +174,14 @@ 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 has("mac")
+" if pressed accidentally while in insert mode (happens on Mac when alt
+" doesn't send escape).
+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
 
@@ -183,7 +189,7 @@ endif
 " SYNTAX SETTINGS
 
 " Activate syntax coloring.
-if has("syntax")
+if has('syntax')
     syntax enable
 
 " Highlight text longer then 78 characters. Thanks to Tony Mechelynck
@@ -200,7 +206,7 @@ endif
 
 " 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.
@@ -211,7 +217,7 @@ map <Leader><Leader> <plug>NERDCommenterToggle
 
 " Use a custom auto group to prevent problems when the vimrc files is sourced
 " twice.
-if has("autocmd")
+if has('autocmd')
     augroup vimrc
         autocmd!