# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1497363303 -7200
# Node ID d32a62babf5f09a39e433b160c399fd0d5ffc821
# Parent  d0ec98a59c07ba4044d8d562d85d5056174506db
patch 8.0.0639: the cursor position is set when editing a new commit message

commit https://github.com/vim/vim/commit/9a48961d8bd7ffea14330b9b0181a6cdbe9288f7
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jun 13 16:12:51 2017 +0200

    patch 8.0.0639: the cursor position is set when editing a new commit message

    Problem:    The cursor position is set to the last position in a new commit
                message.
    Solution:   Don't set the position if the filetype matches "commit".
                (Christian Brabandt)

diff --git a/runtime/defaults.vim b/runtime/defaults.vim
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2017 Apr 12
+" Last change:	2017 Jun 13
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -106,12 +106,13 @@ if has("autocmd")
     au!
 
     " When editing a file, always jump to the last known cursor position.
-    " Don't do it when the position is invalid or when inside an event handler
-    " (happens when dropping a file on gvim).
+    " Don't do it when the position is invalid, when inside an event handler
+    " (happens when dropping a file on gvim) and for a commit message (it's
+    " likely a different one than last time).
     autocmd BufReadPost *
-      \ if line("'\"") >= 1 && line("'\"") <= line("$") |
-      \   exe "normal! g`\"" |
-      \ endif
+      \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
+      \ |   exe "normal! g`\""
+      \ | endif
 
   augroup END
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    639,
+/**/
     638,
 /**/
     637,