aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-05-23 11:15:30 +0300
committerEli Zaretskii2015-05-23 11:15:30 +0300
commitb8e18b63a3270090469b1092dea9520bb2c9a435 (patch)
tree9f3bf77fe174b0e244a39a0c92667bf9afc49556
parentd6dfefe40528a6a9ab6d0cbc5f1a450075241141 (diff)
downloademacs-b8e18b63a3270090469b1092dea9520bb2c9a435.tar.gz
emacs-b8e18b63a3270090469b1092dea9520bb2c9a435.zip
Improve documentation of 'set-fontset-font'
* doc/lispref/display.texi (Fontsets): Document the value of nil for the 3rd argument of 'set-fontset-font'.
-rw-r--r--doc/lispref/display.texi9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 05bcd9fd297..b12995be6ed 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3304,6 +3304,9 @@ fontset, whose short name is @samp{fontset-default}.
3304@var{character} may be a script name. In that case, use 3304@var{character} may be a script name. In that case, use
3305@var{font-spec} for all character in the charsets. 3305@var{font-spec} for all character in the charsets.
3306 3306
3307@var{font-spec} may be a font-spec object created by the function
3308@code{font-spec} (@pxref{Low-Level Font}).
3309
3307@var{font-spec} may be a cons; @code{(@var{family} . @var{registry})}, 3310@var{font-spec} may be a cons; @code{(@var{family} . @var{registry})},
3308where @var{family} is a family name of a font (possibly including a 3311where @var{family} is a family name of a font (possibly including a
3309foundry name at the head), @var{registry} is a registry name of a font 3312foundry name at the head), @var{registry} is a registry name of a font
@@ -3311,6 +3314,12 @@ foundry name at the head), @var{registry} is a registry name of a font
3311 3314
3312@var{font-spec} may be a font name string. 3315@var{font-spec} may be a font name string.
3313 3316
3317@var{font-spec} may be @code{nil}, which explicitly specifies that
3318there's no font for the specified @var{character}. This is useful,
3319for example, to avoid expensive system-wide search for fonts for
3320characters that have no glyphs, like those from the Unicode Private
3321Use Area (PUA).
3322
3314The optional argument @var{add}, if non-@code{nil}, specifies how to 3323The optional argument @var{add}, if non-@code{nil}, specifies how to
3315add @var{font-spec} to the font specifications previously set. If it 3324add @var{font-spec} to the font specifications previously set. If it
3316is @code{prepend}, @var{font-spec} is prepended. If it is 3325is @code{prepend}, @var{font-spec} is prepended. If it is