updated for version 7.1-046

diff --git a/src/regexp.c b/src/regexp.c
index bf0f67a030096ae2e7e5419acc27e152d8f6e411..071663f66fbcda894a03c258ab04cef4fbc7fd68 100644 (file)
--- 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 c4e1de31f5b661152b1ecdbf16a703034e567252..65fa188c08d795cc0f5dd979cb91f860c87ba793 100644 (file)
--- 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,
 /**/