# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1204177563 0
# Node ID eecc39fe9ec94fa867b81153b2ce28e111b54f79
# Parent  694466e46d7afddc5bc0909e461f78f122966b54
(handle_auto_composed_prop): Don't make composition if it->string
is a string.

diff -r 694466e46d7a -r eecc39fe9ec9 src/xdisp.c
--- a/src/xdisp.c	Thu Feb 28 03:49:35 2008 +0000
+++ b/src/xdisp.c	Thu Feb 28 05:46:03 2008 +0000
@@ -4634,7 +4634,7 @@
 		val = Qnil;
 	    }
 	}
-      if (NILP (val))
+      if (NILP (val) && ! STRINGP (it->string))
 	{
 	  if (limit < 0)
 	    limit = (STRINGP (it->string) ? SCHARS (it->string)