patch 7.4.848

Problem:    CTRL-A on hex number in Visual block mode is incorrect.
Solution:   Account for the "0x". (Hirohito Higashi)

diff --git a/src/charset.c b/src/charset.c
index 327fa0375a6004d1822b88321b0cb77d95585615..a74bf0d5bf705a091cdb009f39f221e4fe4e4792 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -1909,6 +1909,8 @@ vim_str2nr(start, hexp, len, dooct, dohex, nptr, unptr, maxlen)
     else if (hex != 0 || dohex > 1)
     {
        /* hex */
+       if (hex != 0)
+           n += 2;         /* skip over "0x" */
        while (vim_isxdigit(*ptr))
        {
            un = 16 * un + (unsigned long)hex2nr(*ptr);

diff --git a/src/testdir/test_increment.in b/src/testdir/test_increment.in
index ecbc6f99a13ac3a0b458d729c1e2dae96429a418..2ae6b8a56395be276bd2eb8d84742aa30a9060f1 100644 (file)
--- a/src/testdir/test_increment.in
+++ b/src/testdir/test_increment.in
@@ -277,7 +277,15 @@ Text:
  Expected:
  1) <Ctrl-a> and cursor is on a
  b
-   
+
+21) block-wise increment on part of hexadecimal
+Text:
+0x123456
+
+  Expected:
+  1) Ctrl-V f3 <ctrl-a>
+0x124456
+
 
 
 STARTTEST
@@ -401,6 +409,12 @@ V3kg\ 1..
 \ 1:.put =col('.')
 :set nrformats&vim
 
+:" Test 21
+:/^S21=/+,/^E21=/-y a
+:/^E21=/+put a
+:set nrformats&vim
+\16f3\ 1
+
 :" Save the report
 :/^# Test 1/,$w! test.out
 :qa!
@@ -594,6 +608,13 @@ E20====
 
 
 
+# Test 21
+S21====
+0x123456
+E21====
+
+
+
 
 ENDTEST
 

diff --git a/src/testdir/test_increment.ok b/src/testdir/test_increment.ok
index 48e722f038eadd20197f02e70f91d8b1abb76aa2..15d0e9b50bbf43c4b0832338541e998accca920a 100644 (file)
--- a/src/testdir/test_increment.ok
+++ b/src/testdir/test_increment.ok
@@ -280,6 +280,14 @@ b
 1
 
 
+# Test 21
+S21====
+0x123456
+E21====
+
+0x124456
+
+
 
 ENDTEST
 

diff --git a/src/version.c b/src/version.c
index 1a5e2376481f82092f1efb32b7614563103e8a52..b50521b626117bedeae9e142b4f7bca56201b5b2 100644 (file)
--- 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 */
+/**/
+    848,
 /**/
     847,
 /**/