summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-11-20 10:56:33 +0000
committerBram Moolenaar <Bram@vim.org>2008-11-20 10:56:33 +0000
commit3025b39e973fa6edd495a61a7b6ad68c874bcc84 (patch)
treeeefe911ec199ebb20d46a3dfb5b71851b7394df1
parent9774ecc80cd245a1c6b573633c6cccbd4e201bb9 (diff)
downloadvim-git-3025b39e973fa6edd495a61a7b6ad68c874bcc84.tar.gz
updated for version 7.2-046v7.2.046
-rw-r--r--src/mbyte.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index 134a95600..b7114e8b4 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -3131,7 +3131,7 @@ enc_locale()
else
s = p + 1;
}
- for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i)
+ for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
{
if (s[i] == '_' || s[i] == '-')
buf[i] = '-';
diff --git a/src/version.c b/src/version.c
index 3529bb084..b106c951b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 46,
+/**/
45,
/**/
44,