summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-12-05 21:06:46 +0000
committerBram Moolenaar <Bram@vim.org>2006-12-05 21:06:46 +0000
commit201863f75dbe0e5b5a6a7a6ff071581cbc54d3a1 (patch)
treee600f180f85c1842af411d0e412d33c55bc1a8f3
parentcf8e7d14aa79066f4b539abdb467ac2e391271dd (diff)
downloadvim-git-201863f75dbe0e5b5a6a7a6ff071581cbc54d3a1.tar.gz
updated for version 7.0-178v7.0.178
-rw-r--r--src/mbyte.c6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index 846ce98f7..735bf6544 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2294,8 +2294,14 @@ mb_strnicmp(s1, s2, nn)
}
/* Check directly first, it's faster. */
for (j = 0; j < l; ++j)
+ {
if (s1[i + j] != s2[i + j])
break;
+ if (s1[i + j] == 0)
+ /* Both stings have the same bytes but are incomplete or
+ * have illegal bytes, accept them as equal. */
+ l = j;
+ }
if (j < l)
{
/* If one of the two characters is incomplete return -1. */
diff --git a/src/version.c b/src/version.c
index e20349dc9..09cbf736b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 178,
+/**/
177,
/**/
176,