From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 30 Jul 2007 20:32:53 +0000 (+0000)
Subject: updated for version 7.1-046
X-Git-Tag: v7.1.046
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9225efbc96378375139fef343f6ee88bc266013c;p=vim

updated for version 7.1-046
---

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
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    46,
 /**/
     45,
 /**/