summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-12-15 12:30:30 +0200
committerEli Zaretskii <eliz@gnu.org>2017-12-15 12:30:30 +0200
commitd64b88da2fcc23cb0676fca382b4ddc7d1b68020 (patch)
tree7117ecc1009ec920739ca060c40ff3ba93c6c44b /src
parent92b2604a7f1757e0b2487451441c39a48f989c19 (diff)
downloademacs-d64b88da2fcc23cb0676fca382b4ddc7d1b68020.tar.gz
* src/font.c (Ffont_info): Doc fix. (Bug#29682)
Diffstat (limited to 'src')
-rw-r--r--src/font.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/font.c b/src/font.c
index 441652b0951..69efd7d56d2 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: