# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1278967353 -7200
# Node ID 81527f127fb100591d33ccb2d74420703280b376
# Parent  9577a28005e10fab0a0cada6c41b96c9a3e1bfe9
Fix: Composing characters in :s substitute text were dropped.

diff --git a/src/regexp.c b/src/regexp.c
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -7140,10 +7140,26 @@ vim_regsub_both(source, dest, copy, magi
 #ifdef FEAT_MBYTE
 	    if (has_mbyte)
 	    {
-		src += mb_ptr2len(src - 1) - 1;
+		int totlen = mb_ptr2len(src - 1);
+
 		if (copy)
 		    mb_char2bytes(cc, dst);
 		dst += mb_char2len(cc) - 1;
+		if (enc_utf8)
+		{
+		    int clen = utf_ptr2len(src - 1);
+
+		    /* If the character length is shorter than "totlen", there
+		     * are composing characters; copy them as-is. */
+		    if (clen < totlen)
+		    {
+			if (copy)
+			    mch_memmove(dst + 1, src - 1 + clen,
+						     (size_t)(totlen - clen));
+			dst += totlen - clen;
+		    }
+		}
+		src += totlen - 1;
 	    }
 	    else
 #endif