summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-07-30 20:32:53 +0000
committerBram Moolenaar <Bram@vim.org>2007-07-30 20:32:53 +0000
commit9225efbc96378375139fef343f6ee88bc266013c (patch)
treebc4e43bcda9db54591c92167af7141d6a0d04379
parent943fae459d1a4aeb750ee2f7d5d7ade642609b4d (diff)
downloadvim-git-9225efbc96378375139fef343f6ee88bc266013c.tar.gz
updated for version 7.1-046v7.1.046
-rw-r--r--src/regexp.c9
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/src/regexp.c b/src/regexp.c
index bf0f67a03..071663f66 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -7014,7 +7014,14 @@ vim_regsub_both(source, dest, copy, magic, backslash)
#ifdef FEAT_MBYTE
if (has_mbyte)
{
- int l = mb_ptr2len(s) - 1;
+ int l;
+
+ /* Copy composing characters separately, one
+ * at a time. */
+ if (enc_utf8)
+ l = utf_ptr2len(s) - 1;
+ else
+ l = mb_ptr2len(s) - 1;
s += l;
len -= l;
diff --git a/src/version.c b/src/version.c
index c4e1de31f..65fa188c0 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 */
/**/
+ 46,
+/**/
45,
/**/
44,