diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-28 15:38:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-28 15:38:40 +0200 |
| commit | 9a91c7a1f9134f799b8672a4e3844781263e8cf3 (patch) | |
| tree | b4d1b0fec0414e075c5a8e3cd6999d2147d2d8b0 | |
| parent | 0e19fc07e73214f94441cb3a495504a1de21eb07 (diff) | |
| download | vim-git-9a91c7a1f9134f799b8672a4e3844781263e8cf3.tar.gz | |
patch 8.0.1229: condition in vim_str2nr() is always truev8.0.1229
Problem: Condition in vim_str2nr() is always true. (Nikolai Pavlov)
Solution: Remove the condition. (Closes #2259)
| -rw-r--r-- | src/charset.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/charset.c b/src/charset.c index 4516816fe..a8b704c69 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 b49c7643c..1da082d1f 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, |