aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-06-14 18:13:06 +0300
committerEli Zaretskii2015-06-14 18:13:06 +0300
commit2f09f8952489b5c90488faf66f71a4252aed5c2c (patch)
tree1207f6a94b52e729e28001391eac613def8d04f9
parentfce59d43e4d6890c1fb694a593dad828e3e3925d (diff)
downloademacs-2f09f8952489b5c90488faf66f71a4252aed5c2c.tar.gz
emacs-2f09f8952489b5c90488faf66f71a4252aed5c2c.zip
Another improvement of documentation of set-fontset-font
* doc/lispref/display.texi (Fontsets): Say explicitly that CHARACTER can be a single codepoint. * src/fontset.c (Fset_fontset_font): Doc fix.
-rw-r--r--doc/lispref/display.texi10
-rw-r--r--src/fontset.c8
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index b4e20371f35..9e9f8e3ca45 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3284,7 +3284,7 @@ field.
3284 3284
3285@defun set-fontset-font name character font-spec &optional frame add 3285@defun set-fontset-font name character font-spec &optional frame add
3286This function modifies the existing fontset @var{name} to use the font 3286This function modifies the existing fontset @var{name} to use the font
3287matching with @var{font-spec} for the character @var{character}. 3287matching with @var{font-spec} for the specified @var{character}.
3288 3288
3289If @var{name} is @code{nil}, this function modifies the fontset of the 3289If @var{name} is @code{nil}, this function modifies the fontset of the
3290selected frame or that of @var{frame} if @var{frame} is not 3290selected frame or that of @var{frame} if @var{frame} is not
@@ -3293,10 +3293,10 @@ selected frame or that of @var{frame} if @var{frame} is not
3293If @var{name} is @code{t}, this function modifies the default 3293If @var{name} is @code{t}, this function modifies the default
3294fontset, whose short name is @samp{fontset-default}. 3294fontset, whose short name is @samp{fontset-default}.
3295 3295
3296@var{character} may be a cons; @code{(@var{from} . @var{to})}, where 3296In addition to specifying a single codepoint, @var{character} may be a
3297@var{from} and @var{to} are character codepoints. In that case, use 3297cons @code{(@var{from} . @var{to})}, where @var{from} and @var{to} are
3298@var{font-spec} for all characters in the range @var{from} and @var{to} 3298character codepoints. In that case, use @var{font-spec} for all the
3299(inclusive). 3299characters in the range @var{from} and @var{to} (inclusive).
3300 3300
3301@var{character} may be a charset. In that case, use 3301@var{character} may be a charset. In that case, use
3302@var{font-spec} for all character in the charsets. 3302@var{font-spec} for all character in the charsets.
diff --git a/src/fontset.c b/src/fontset.c
index 5fc92feb130..f1a3e597409 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1411,9 +1411,11 @@ Modify fontset NAME to use FONT-SPEC for TARGET characters.
1411NAME is a fontset name string, nil for the fontset of FRAME, or t for 1411NAME is a fontset name string, nil for the fontset of FRAME, or t for
1412the default fontset. 1412the default fontset.
1413 1413
1414TARGET may be a cons; (FROM . TO), where FROM and TO are characters. 1414TARGET may be a single character to use FONT-SPEC for.
1415In that case, use FONT-SPEC for all characters in the range FROM and 1415
1416TO (inclusive). 1416Target may be a cons (FROM . TO), where FROM and TO are characters.
1417In that case, use FONT-SPEC for all characters in the range FROM
1418and TO (inclusive).
1417 1419
1418TARGET may be a script name symbol. In that case, use FONT-SPEC for 1420TARGET may be a script name symbol. In that case, use FONT-SPEC for
1419all characters that belong to the script. 1421all characters that belong to the script.