From 9a91c7a1f9134f799b8672a4e3844781263e8cf3 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 28 Oct 2017 15:38:40 +0200
Subject: [PATCH] patch 8.0.1229: condition in vim_str2nr() is always true

Problem:    Condition in vim_str2nr() is always true. (Nikolai Pavlov)
Solution:   Remove the condition. (Closes #2259)
---
 src/charset.c | 3 +--
 src/version.c | 2 ++
 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
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1229,
 /**/
     1228,
 /**/