[Emacs-diffs] Changes to emacs/lisp/international/mule-diag.el,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/05/30 02:37:13

Index: mule-diag.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-diag.el,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- mule-diag.el        27 May 2008 20:09:51 -0000      1.114
+++ mule-diag.el        30 May 2008 02:37:13 -0000      1.115
@@ -835,23 +835,18 @@
   (interactive "sFont name (default current choice for ASCII chars): ")
   (or (and window-system (fboundp 'fontset-list))
       (error "No fonts being used"))
-  (let (fontset font-info)
-    (when (or (not fontname) (= (length fontname) 0))
-      (setq fontname (frame-parameter nil 'font))
-      ;; Check if FONTNAME is a fontset.
-      (if (query-fontset fontname)
-         (setq fontset fontname
-               fontname (nth 1 (assq 'ascii
-                                     (aref (fontset-info fontname) 2))))))
+  (let (font-info)
+    (if (or (not fontname) (= (length fontname) 0))
+       (setq fontname (face-attribute 'default :font)))
     (setq font-info (font-info fontname))
     (if (null font-info)
-       (if fontset
+       (if (fontp fontname 'font-object)
            ;; The font should be surely used.  So, there's some
            ;; problem about getting information about it.  It is
            ;; better to print the fontname to show which font has
            ;; this problem.
-           (message "No information about \"%s\"" fontname)
-         (message "No matching font being used"))
+           (message "No information about \"%s\"" (font-xlfd-name fontname))
+         (message "No matching font found"))
       (with-output-to-temp-buffer "*Help*"
        (describe-font-internal font-info 'verbose)))))