updated for version 7.0142
diff --git a/src/search.c b/src/search.c
index 3013d13..37b3873 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1105,7 +1105,16 @@
if (msgbuf != NULL)
{
msgbuf[0] = dirc;
- STRCPY(msgbuf + 1, p);
+#ifdef FEAT_MBYTE
+ if (enc_utf8 && utf_iscomposing(utf_ptr2char(p)))
+ {
+ /* Use a space to draw the composing char on. */
+ msgbuf[1] = ' ';
+ STRCPY(msgbuf + 2, p);
+ }
+ else
+#endif
+ STRCPY(msgbuf + 1, p);
if (spats[0].off.line || spats[0].off.end || spats[0].off.off)
{
p = msgbuf + STRLEN(msgbuf);