# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1402591162 -7200
# Node ID 238f5027830cad22e17a970483af9b160869cdf3
# Parent  c23596b8e34f3b234b51156671e6bd34457cb08f
updated for version 7.4.323
Problem:    Substitute() with zero width pattern breaks multi-byte character.
Solution:   Take multi-byte character size into account. (Yukihiro Nakadaira)

diff --git a/src/eval.c b/src/eval.c
--- a/src/eval.c
+++ b/src/eval.c
@@ -24848,8 +24848,11 @@ do_string_sub(str, pat, sub, flags)
 		if (zero_width == regmatch.startp[0])
 		{
 		    /* avoid getting stuck on a match with an empty string */
-		    *((char_u *)ga.ga_data + ga.ga_len) = *tail++;
-		    ++ga.ga_len;
+		    i = MB_PTR2LEN(tail);
+		    mch_memmove((char_u *)ga.ga_data + ga.ga_len, tail,
+								   (size_t)i);
+		    ga.ga_len += i;
+		    tail += i;
 		    continue;
 		}
 		zero_width = regmatch.startp[0];
diff --git a/src/testdir/test69.in b/src/testdir/test69.in
--- a/src/testdir/test69.in
+++ b/src/testdir/test69.in
@@ -180,6 +180,13 @@ byteidx
 byteidxcomp
 
 STARTTEST
+/^substitute
+:let y = substitute('１２３', '\zs', 'a', 'g')    | put =y
+ENDTEST
+
+substitute
+
+STARTTEST
 :g/^STARTTEST/.,/^ENDTEST/d
 :1;/^Results/,$wq! test.out
 ENDTEST
diff --git a/src/testdir/test69.ok b/src/testdir/test69.ok
--- a/src/testdir/test69.ok
+++ b/src/testdir/test69.ok
@@ -160,3 +160,7 @@ byteidxcomp
 [0, 1, 3, 4, -1]
 [0, 1, 2, 4, 5, -1]
 
+
+substitute
+a１a２a３a
+
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    323,
+/**/
     322,
 /**/
     321,