X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=2769ffd6e083b48c022fa8edbaefae70e39cc975;hb=704caf1b57d0a74005ee1b6c5540b07514e39bcb;hp=2823246d4cec2a54d449c3801756f7fa8f5bf85e;hpb=da7ed32dc51735766944436c96d03a7d6822f659;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 2823246..2769ffd 100644
--- a/vimrc
+++ b/vimrc
@@ -10,6 +10,11 @@ if $HOME == '/root' || exists('$SUDO_USER')
     qa
 endif
 
+
+" Reset all options (except 'term, 'lines' and 'columns'). This makes sure a
+" system wide configuration file doesn't change default values.
+set all&
+
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
 
@@ -118,7 +123,7 @@ if v:version >= 700
 endif
 
 " Display tabs, trailing space, non breakable spaces and long lines (when
-" wrapping is enabled).
+" wrapping is disabled).
 set list
 set listchars=trail:-,extends:>
 if v:version >= 700
@@ -233,8 +238,8 @@ if has('syntax')
     syntax enable
 
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
-" <antoine.mechelynck@gmail.com> from the Vim mailing list.
-" It can easily be disabled if necessary with :2match (in Vim >= 700).
+" <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
+" disabled when necessary with :2match (in Vim >= 700).
     if v:version >= 700
         2match Todo /\%>78v./
     else
@@ -299,8 +304,7 @@ if has('autocmd')
 " may contain one which could change the filetype or other settings of the
 " commit buffer. Also make sure we use only 72 characters per line which is
 " the recommendation for git commit messages (http://tpope.net/node/106).
-        autocmd FileType gitcommit setlocal nomodeline |
-                                 \ let g:secure_modelines_allowed_items = [] |
+        autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] |
                                  \ setlocal textwidth=72
 " Allow folding in perl.
         autocmd FileType perl let perl_fold = 1 |