summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-02-26 18:46:01 +0100
committerBram Moolenaar <Bram@vim.org>2013-02-26 18:46:01 +0100
commitf5e44a7e90a68f91da540fe9da8b62fb9e2aeea6 (patch)
tree5baf90058f28eb0cd21158b320f600555cf11a35
parente468e266c45806c782f387ef631a99bfb2575576 (diff)
updated for version 7.3.840v7.3.840
Problem: "\@<!" in regexp does not work correctly with multi-byte characters, especially cp932. Solution: Move column to start of multi-byte character. (Yasuhiro Matsumoto)
-rw-r--r--src/regexp.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/regexp.c b/src/regexp.c
index d85ded8af0..6ecb6dd7a3 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -5449,6 +5449,13 @@ regmatch(scan)
}
}
else
+#ifdef FEAT_MBYTE
+ if (has_mbyte)
+ rp->rs_un.regsave.rs_u.pos.col -=
+ (*mb_head_off)(regline, regline
+ + rp->rs_un.regsave.rs_u.pos.col - 1) + 1;
+ else
+#endif
--rp->rs_un.regsave.rs_u.pos.col;
}
else
diff --git a/src/version.c b/src/version.c
index 95cea6a77c..7c12188fe5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 840,
+/**/
839,
/**/
838,