# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1220575827 0
# Node ID 672009e514b4223e67917eba96e3a482daa0bd16
# Parent  b5a42c692791a29e6b62f2adc965de31efa29b5b
(describe-char): Fix handling of automatic composition.

diff -r b5a42c692791 -r 672009e514b4 lisp/descr-text.el
--- a/lisp/descr-text.el	Fri Sep 05 00:47:23 2008 +0000
+++ b/lisp/descr-text.el	Fri Sep 05 00:50:27 2008 +0000
@@ -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)