From 9a48961d8bd7ffea14330b9b0181a6cdbe9288f7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 13 Jun 2017 16:12:51 +0200 Subject: [PATCH] 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) --- runtime/defaults.vim | 13 +++++++------ src/version.c | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/runtime/defaults.vim b/runtime/defaults.vim index 6fd43db51..0dcb92245 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -1,7 +1,7 @@ " The default vimrc file. " " Maintainer: Bram Moolenaar -" 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 index 00733b359..13dff53fa 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 639, /**/ 638, /**/ -- 2.40.0