[Emacs-diffs] Changes to emacs/lisp/descr-text.el,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/09/05 00:50:27

Index: descr-text.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/descr-text.el,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- descr-text.el       4 Aug 2008 12:01:54 -0000       1.70
+++ descr-text.el       5 Sep 2008 00:50:27 -0000       1.71
@@ -601,14 +601,20 @@
                        "\"")))
          (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)