2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 20f1b129faf..0dc4447a971 100644
--- 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>
 
diff --git a/src/xdisp.c b/src/xdisp.c
index c6ebd596c2d..b558c2e8bbb 100644
--- 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)