Merge commit 'rammstein/master'

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index fbf5a87cfb4e8f16e589b832493ff7e82ede6979..4b166e994d90d06a547ed5a5d12cfd4399e84617 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -81,7 +81,7 @@ set smartcase
 
 " Activate spell checking, use English as default. Don't use spell checking
 " when diffing.
-if v:version >= 700 && !&diff
+if v:version >= 700 && has('syntax') && !&diff
     set spell
     set spelllang=en_us
 endif
@@ -155,7 +155,7 @@ endif
 " Add semicolon to the end of the line. Thanks to
 " http://www.van-laarhoven.org/vim/.vimrc for this idea and godlygeek in #vim
 " on Freenode for an improved version which doesn't clobber any marks.
-nnoremap <silent> ; :call setline(line('.'), getline('.') . ';')<CR>
+nnoremap <silent> <Leader>; :call setline(line('.'), getline('.') . ';')<CR>
 
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
 " Thanks to Tony Mechelynck <antoine.mechelynck@gmail.com> from the Vim
@@ -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