aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/display.texi8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 1f7cc93c9c4..fa81b2e9538 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2893,7 +2893,7 @@ This function returns the name of the font of face @var{face}.
2893 2893
2894If the optional argument @var{frame} is specified, it returns the name 2894If the optional argument @var{frame} is specified, it returns the name
2895of the font of @var{face} for that frame. If @var{frame} is omitted or 2895of the font of @var{face} for that frame. If @var{frame} is omitted or
2896@code{nil}, the selected frame is used. And, in this case, if the 2896@code{nil}, the selected frame is used. In the latter case, if the
2897optional third argument @var{character} is supplied, it returns the font 2897optional third argument @var{character} is supplied, it returns the font
2898name used for @var{character}. 2898name used for @var{character}.
2899@end defun 2899@end defun
@@ -3934,12 +3934,14 @@ was remapped. @xref{Face Remapping}.
3934 3934
3935@defun default-font-width 3935@defun default-font-width
3936This function returns the average width in pixels of the font used by 3936This function returns the average width in pixels of the font used by
3937the current buffer's default face. 3937the current buffer's default face, as that face is defined for the
3938selected frame.
3938@end defun 3939@end defun
3939 3940
3940@defun default-font-height 3941@defun default-font-height
3941This function returns the height in pixels of the font used by the 3942This function returns the height in pixels of the font used by the
3942current buffer's default face. 3943current buffer's default face, as that face is defined for the
3944selected frame.
3943@end defun 3945@end defun
3944 3946
3945@defun window-font-width &optional window face 3947@defun window-font-width &optional window face