From 25c2f6783a9d5f15e062bd5b085abe7deb121152 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 11 Aug 2015 19:36:42 +0200 Subject: patch 7.4.823 Problem: Cursor moves after CTRL-A on alphabetic character. Solution: (Hirohito Higashi, test by Christian Brabandt) --- src/ops.c | 1 + src/testdir/test_increment.in | 24 +++++++++++++++++++++++- src/testdir/test_increment.ok | 9 +++++++++ src/version.c | 2 ++ 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/ops.c b/src/ops.c index f53567bc10..62d88a786a 100644 --- a/src/ops.c +++ b/src/ops.c @@ -5584,6 +5584,7 @@ do_addsub(command, Prenum1, g_cmd) did_change = TRUE; (void)del_char(FALSE); ins_char(firstdigit); + curwin->w_cursor.col = col; } else { diff --git a/src/testdir/test_increment.in b/src/testdir/test_increment.in index fb7e6e3ee2..ecbc6f99a1 100644 --- a/src/testdir/test_increment.in +++ b/src/testdir/test_increment.in @@ -268,7 +268,15 @@ Text: Expected: 1) j$ 2 - 1b + 2a + +20) increment a single letter +Text: + a + + Expected: + 1) and cursor is on a + b @@ -386,6 +394,13 @@ V3kg.. k$ :set nrformats&vim +:" Test 20 +:set nrformats+=alpha +:/^S20=/+,/^E20=/-y a +:/^E20=/+put a +:.put =col('.') +:set nrformats&vim + :" Save the report :/^# Test 1/,$w! test.out :qa! @@ -572,6 +587,13 @@ E19==== +# Test 20 +S20==== +a +E20==== + + + ENDTEST diff --git a/src/testdir/test_increment.ok b/src/testdir/test_increment.ok index 685478e668..48e722f038 100644 --- a/src/testdir/test_increment.ok +++ b/src/testdir/test_increment.ok @@ -271,6 +271,15 @@ E19==== 2a +# Test 20 +S20==== +a +E20==== + +b +1 + + ENDTEST diff --git a/src/version.c b/src/version.c index 62eb4ed46f..c2fd979cad 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 823, /**/ 822, /**/ -- cgit v1.2.3