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

diff --git a/vimrc b/vimrc
index 2823246..9dc6bdf 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
 
@@ -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 |