[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 d64b88d: * src/font.c (Ffont_info): Doc fix. (Bug
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 d64b88d: * src/font.c (Ffont_info): Doc fix. (Bug#29682) |
Date: |
Fri, 15 Dec 2017 05:31:06 -0500 (EST) |
branch: emacs-26
commit d64b88da2fcc23cb0676fca382b4ddc7d1b68020
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
* src/font.c (Ffont_info): Doc fix. (Bug#29682)
---
src/font.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/font.c b/src/font.c
index 441652b..69efd7d 100644
--- a/src/font.c
+++ b/src/font.c
@@ -5055,10 +5055,10 @@ DEFUN ("font-info", Ffont_info, Sfont_info, 1, 2, 0,
doc: /* Return information about a font named NAME on frame FRAME.
If FRAME is omitted or nil, use the selected frame.
-The returned value is a vector:
+The returned value is a vector of 14 elements:
[ OPENED-NAME FULL-NAME SIZE HEIGHT BASELINE-OFFSET RELATIVE-COMPOSE
DEFAULT-ASCENT MAX-WIDTH ASCENT DESCENT SPACE-WIDTH AVERAGE-WIDTH
- CAPABILITY ]
+ FILENAME CAPABILITY ]
where
OPENED-NAME is the name used for opening the font,
FULL-NAME is the full name of the font,
@@ -5068,12 +5068,12 @@ where
RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling
how to compose characters,
MAX-WIDTH is the maximum advance width of the font,
- ASCENT, DESCENT, SPACE-WIDTH, AVERAGE-WIDTH are metrics of the font
- in pixels,
+ ASCENT, DESCENT, SPACE-WIDTH, and AVERAGE-WIDTH are metrics of
+ the font in pixels,
FILENAME is the font file name, a string (or nil if the font backend
doesn't provide a file name).
CAPABILITY is a list whose first element is a symbol representing the
- font format, one of x, opentype, truetype, type1, pcf, or bdf.
+ font format, one of `x', `opentype', `truetype', `type1', `pcf', or `bdf'.
The remaining elements describe the details of the font capabilities,
as follows:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 d64b88d: * src/font.c (Ffont_info): Doc fix. (Bug#29682),
Eli Zaretskii <=