summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-11-29 20:27:21 +0000
committerBram Moolenaar <Bram@vim.org>2007-11-29 20:27:21 +0000
commit8f5c578a5e1cc6750577fa7283d825fc886410fc (patch)
tree8839e471945334caa6c1b1ca58c765dd0ef611db
parent9273c73e36e622216dce8590f7b1140654339d3f (diff)
updated for version 7.1-164v7.1.164
-rw-r--r--src/regexp.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/regexp.c b/src/regexp.c
index b62f877a82..6717d2c736 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -2770,7 +2770,8 @@ skipchr()
{
#ifdef FEAT_MBYTE
if (enc_utf8)
- prevchr_len += utf_char2len(mb_ptr2char(regparse + prevchr_len));
+ /* exclude composing chars that mb_ptr2len does include */
+ prevchr_len += utf_ptr2len(regparse + prevchr_len);
else if (has_mbyte)
prevchr_len += (*mb_ptr2len)(regparse + prevchr_len);
else
diff --git a/src/version.c b/src/version.c
index 1dd2a23930..1aecf6c270 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 */
/**/
+ 164,
+/**/
163,
/**/
162,