# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1509198304 -7200
# Node ID a99da335b6f12c4127f96d9cc6df4b06e5fb0457
# Parent  61b0d91614178b5f85ccfa60d7a6867c23e3704e
patch 8.0.1229: condition in vim_str2nr() is always true

commit https://github.com/vim/vim/commit/9a91c7a1f9134f799b8672a4e3844781263e8cf3
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Oct 28 15:38:40 2017 +0200

    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 https://github.com/vim/vim/issues/2259)

diff --git a/src/charset.c b/src/charset.c
--- 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
--- 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,