(handle_auto_composed_prop): Don't make composition if it->string

is a string.

(handle_auto_composed_prop): Don't make composition if it->string
is a string.
ee548a94 · Kenichi Handa · 74c52de1 · ee548a94 · ee548a94
Commit ee548a94 authored Feb 28, 2008 by Kenichi Handa
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

src/ChangeLog src/ChangeLog +2 -0

src/xdisp.c src/xdisp.c +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>


--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4634,7 +4634,7 @@ handle_auto_composed_prop (it)
 		val = Qnil;
 	    }
 	}
-      if (NILP (val))
+      if (NILP (val) && ! STRINGP (it->string))
 	{
 	  if (limit < 0)
 	    limit = (STRINGP (it->string) ? SCHARS (it->string)