mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

describe-font/font-info works with unloaded fonts

Browse Source 
* lisp/international/mule-diag.el (describe-font): This function
can be used on unloaded fonts, so remove that restriction from the
doc string (bug#16815).  Also allow completion over all fonts on
the system.

* src/font.c (Ffont_info): Ditto for the doc string.
This commit is contained in:
Lars Ingebrigtsen 2019-11-03 16:33:15 +01:00
parent ba8a7882de
commit 5c8375bd68
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/international/mule-diag.el
View File

@ -835,9 +835,16 @@ The IGNORED argument is ignored."
;;;###autoload
(defun describe-font (fontname)
"Display information about a font whose name is FONTNAME.
The font must be already used by Emacs."
(interactive "sFont name (default current choice for ASCII chars): ")
"Display information about a font whose name is FONTNAME."
(interactive
(list (completing-read
"Font name (default current choice for ASCII chars): "
(and window-system
(fboundp 'fontset-list)
;; The final element in `fontset-list' is a default
;; (generic) one, so don't include that.
(nconc (butlast (fontset-list))
(x-list-fonts "*"))))))
(or (and window-system (fboundp 'fontset-list))
(error "No fonts being used"))
(let ((xref-item (list #'describe-font fontname))
@ -847,9 +854,8 @@ The font must be already used by Emacs."
(setq font-info (font-info fontname))
(if (null font-info)
(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
;; If there's some problem with getting information about
;; the font, print the font name to show which font has
;; this problem.
(message "No information about \"%s\"" (font-xlfd-name fontname))
(message "No matching font found"))

4
src/font.c
View File

@ -5127,9 +5127,7 @@ where
FEATURE is a symbol representing OpenType feature tag.
If the font is not an OpenType font, there are no elements
in CAPABILITY except the font format symbol.
If the named font is not yet loaded, return nil. */)
in CAPABILITY except the font format symbol. */)
(Lisp_Object name, Lisp_Object frame)
{
struct frame *f;