Merge commit 'rammstein/master'

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index bd82bc11dd218fbe618643af4e9ae54034535e46..4b166e994d90d06a547ed5a5d12cfd4399e84617 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -256,9 +256,12 @@ if has('autocmd')
 " backupcopy=auto.
         autocmd FileType crontab setlocal backupcopy=yes
 " Don't use the modeline as the diff created by `git commit -v` may contain
-" one which could change the filetype or other settings of the commit window.
+" 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
+" recommondation for git commit messages (http://tpope.net/node/106).
         autocmd FileType gitcommit setlocal nomodeline |
-                                 \ let g:secure_modelines_allowed_items = []
+                                 \ let g:secure_modelines_allowed_items = [] |
+                                 \ setlocal textwidth=72
 " Allow folding in perl.
         autocmd FileType perl let perl_fold = 1 |
                             \ let perl_fold_blocks = 1