X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=d8ed984233f9de16aaf0887b812b588e88cca3ba;hb=8bac9ab6d04a00e3804ecf831de54c2dd2f533a0;hp=48116afca437a22d5092263c9405a6e7c0d439c0;hpb=fad91034c8ceaf15f1bbacf01c463509f007c28a;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 48116af..d8ed984 100644
--- a/vimrc
+++ b/vimrc
@@ -117,6 +117,11 @@ if v:version >= 700
     set listchars+=nbsp:!
 endif
 
+" Always display the status line even if there is only one window.
+if has('statusline')
+    set laststatus=2
+endif
+
 
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
@@ -205,7 +210,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 +240,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