Mercurial > emacs
changeset 95405:6c4caa612333
(describe-font): Don't check fontset
here, and just call font-info. Get the default font by from the
default face.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 30 May 2008 02:37:13 +0000 |
| parents | 4bb963f7ab1a |
| children | ab071b8b8bf4 |
| files | lisp/international/mule-diag.el |
| diffstat | 1 files changed, 6 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/international/mule-diag.el Fri May 30 02:35:54 2008 +0000 +++ b/lisp/international/mule-diag.el Fri May 30 02:37:13 2008 +0000 @@ -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)))))