vimrc: Fix detection of matchadd() support.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 48116afca437a22d5092263c9405a6e7c0d439c0..98009b8611eb2885af03a11a4057c57899698ce9 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -205,7 +205,7 @@ if has('syntax')
     endif
 
 " Highlight TODO, FIXME, CHANGED and XXX in all documents.
-    if v:version >= 701 && has('patch40')
+    if v:version > 701 || (v:version == 701 && has('patch42'))
         call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)')
     endif
 endif
@@ -235,6 +235,8 @@ if has('autocmd')
             \ if line("'\"") > 1 && line("'\"") <= line("$") |
             \     execute "normal! g'\"" |
             \ endif
+" But not for Git commits, go to beginning of the file.
+        autocmd BufReadPost COMMIT_EDITMSG normal! gg
 
 " AFTER/FTPLUGIN AUTO COMMANDS