diff options
| author | Kenichi Handa <handa@m17n.org> | 2008-09-05 00:50:27 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2008-09-05 00:50:27 +0000 |
| commit | f5a60b433b824c9bc3abed62a9884423be1a6f94 (patch) | |
| tree | 36862d00c77829882bbf48dc6a6cbd238a869eb0 /lisp/descr-text.el | |
| parent | 90b3fe912530f5170ae660f0a9a9a66f35714491 (diff) | |
| download | emacs-f5a60b433b824c9bc3abed62a9884423be1a6f94.tar.gz | |
(describe-char): Fix handling of automatic composition.
Diffstat (limited to 'lisp/descr-text.el')
| -rw-r--r-- | lisp/descr-text.el | 12 |
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) |