# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1204177587 0
# Node ID 308d2bf4bef5d66693c8a78fd42234bb543a91cd
# Parent  eecc39fe9ec94fa867b81153b2ce28e111b54f79
*** empty log message ***

diff -r eecc39fe9ec9 -r 308d2bf4bef5 src/ChangeLog
--- a/src/ChangeLog	Thu Feb 28 05:46:03 2008 +0000
+++ b/src/ChangeLog	Thu Feb 28 05:46:27 2008 +0000
@@ -2,6 +2,8 @@
 
 	* xdisp.c (display_mode_element): Cancel the previous change.
 	(decode_mode_spec): Likewise.
+	(handle_auto_composed_prop): Don't make composition if it->string
+	is a string.
 
 2008-02-27  Kim F. Storm  <storm@cua.dk>