(describe-char): Fix handling of automatic composition.

1 files changed, 9 insertions, 3 deletions

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 13f97303783..e585f644cdf 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -601,14 +601,20 @@ as well as widgets, buttons, overlays, and text properties."
                         "\"")))
           (if (and (vectorp (nth 2 composition))
                    (vectorp (aref (nth 2 composition) 0)))
-              (let ((font (aref (aref (nth 2 composition) 0) 0)))
+              (let* ((gstring (nth 2 composition))
+                     (font (lgstring-font gstring))
+                     (nglyphs (lgstring-glyph-len gstring))
+                     (i 0)
+                     glyph)
                 (insert " using this font:\n  "
                         (symbol-name (font-get font :type))
                         ?:
                         (aref (query-font font) 0)
                         "\nby these glyphs:\n")
-                (mapc (lambda (x) (insert (format "  %S\n" x)))
-                      (nth 2 composition)))
+                (while (and (< i nglyphs)
+                            (setq glyph (lgstring-glyph gstring i)))
+                  (insert (format "  %S\n" glyph))
+                  (setq i (1+ i))))
             (insert " by the rule:\n\t(")
             (let ((first t))
               (mapc (lambda (x)