procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(describe-font): Don't check fontset

Browse source 
here, and just call font-info.  Get the default font by from the
default face.
This commit is contained in:
Kenichi Handa 2008-05-30 02:37:31 +00:00
parent 22b7086bdb
commit 7736dabea7
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2008-05-30 Kenichi Handa <handa@m17n.org>
* international/mule-diag.el (describe-font): Don't check fontset
here, and just call font-info. Get the default font by from the
default face.
2008-05-29 Kenichi Handa <handa@m17n.org>
* international/mule-conf.el (utf-8-sig, utf-8-auto): New coding

17
lisp/international/mule-diag.el
View file

@ -835,23 +835,18 @@ The font must be already used by Emacs."
(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)))))