summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 d85ded8af..6ecb6dd7a 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 95cea6a77..7c12188fe 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,