From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 26 Jan 2012 12:40:08 +0000 (+0100)
Subject: updated for version 7.3.414
X-Git-Tag: v7.3.414
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06af60244e0a3e32c8790bce6be40b9c5f330b82;p=vim

updated for version 7.3.414
Problem:    Using CTRL-A on "000" drops the leading zero, while on "001" it
            doesn't.
Solution:   Detect "000" as an octal number. (James McCoy)
---

diff --git a/src/charset.c b/src/charset.c
index 90cf06ceb..98d4bff40 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -764,7 +764,7 @@ ptr2cells(p)
 }
 
 /*
- * Return the number of characters string "s" will take on the screen,
+ * Return the number of character cells string "s" will take on the screen,
  * counting TABs as two characters: "^I".
  */
     int
@@ -775,8 +775,8 @@ vim_strsize(s)
 }
 
 /*
- * Return the number of characters string "s[len]" will take on the screen,
- * counting TABs as two characters: "^I".
+ * Return the number of character cells string "s[len]" will take on the
+ * screen, counting TABs as two characters: "^I".
  */
     int
 vim_strnsize(s, len)
@@ -1830,7 +1830,7 @@ vim_str2nr(start, hexp, len, dooct, dohex, nptr, unptr)
 			hex = 0;	/* can't be octal */
 			break;
 		    }
-		    if (ptr[n] > '0')
+		    if (ptr[n] >= '0')
 			hex = '0';	/* assume octal */
 		}
 	    }
diff --git a/src/version.c b/src/version.c
index 36c3a8480..f7ddf644d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    414,
 /**/
     413,
 /**/