From: Kenichi Handa <handa@m17n.org>
Date: Mon, 10 Jul 2000 04:03:01 +0000 (+0000)
Subject: (describe-font): Adjusted for the chnage of fontset-info.
X-Git-Tag: emacs-pretest-21.0.90~2903
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e8017d240bfbc355d6037bcc513879be0dbc689;p=emacs.git

(describe-font): Adjusted for the chnage of fontset-info.
(print-fontset): Likewise.
---

diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 431efedb9fc..33cb9fee136 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1023,7 +1023,7 @@ but still contains full information about each coding system."
     (setq fontname (cdr (assq 'font (frame-parameters))))
     (if (query-fontset fontname)
 	(setq fontname
-	      (nth 1 (assq 'ascii (fontset-info fontname))))))
+	      (nth 1 (assq 'ascii (aref (fontset-info fontname) 2))))))
   (let ((font-info (font-info fontname)))
     (if (null font-info)
 	(message "No matching font")
@@ -1034,7 +1034,7 @@ but still contains full information about each coding system."
 ;; non-nil, print also names of all opened fonts for FONTSET.  This
 ;; function actually INSERT such information in the current buffer.
 (defun print-fontset (fontset &optional print-fonts)
-  (let ((tail (cdr (fontset-info fontset)))
+  (let ((tail (aref (fontset-info fontset) 2))
 	elt chars font-spec opened prev-charset charset from to)
     (beginning-of-line)
     (insert "Fontset: " fontset "\n")