summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/charset.c3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/charset.c b/src/charset.c
index 4516816fe4..a8b704c698 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1907,8 +1907,7 @@ vim_str2nr(
pre = 0; /* can't be octal */
break;
}
- if (ptr[n] >= '0')
- pre = '0'; /* assume octal */
+ pre = '0'; /* assume octal */
if (n == maxlen)
break;
}
diff --git a/src/version.c b/src/version.c
index b49c7643cf..1da082d1f6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1229,
+/**/
1228,
/**/
1227,