summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-01-26 13:40:08 +0100
committerBram Moolenaar <Bram@vim.org>2012-01-26 13:40:08 +0100
commit06af60244e0a3e32c8790bce6be40b9c5f330b82 (patch)
tree31430863acf1a0a50edef5a9be0200862d03ac18
parent38f5f9529a2657d42fd85d27adc9f778bdf3530e (diff)
downloadvim-git-06af60244e0a3e32c8790bce6be40b9c5f330b82.tar.gz
updated for version 7.3.414v7.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)
-rw-r--r--src/charset.c8
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 4 deletions
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
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 414,
+/**/
413,
/**/
412,