summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2016-04-30 16:15:46 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2016-05-01 19:27:11 +0200
commit0846f21b77d38a568c4ceb143504472a2dd51aee (patch)
tree7babe03f650151a51a51981c64c22ef878dbdc98 /lisp
parent925af7e0bec15151149a2132d203753ad7610182 (diff)
downloademacs-0846f21b77d38a568c4ceb143504472a2dd51aee.tar.gz
emacs-0846f21b77d38a568c4ceb143504472a2dd51aee.tar.bz2
emacs-0846f21b77d38a568c4ceb143504472a2dd51aee.zip
Tiny doc clarification for create-fontset-from-fontset-spec
* lisp/international/fontset.el (create-fontset-from-fontset-spec): Clarify what the optional part is (bug#18686). (cherry picked from commit c05d186455ce9907eeb6b21ea4227e453996c681)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/international/fontset.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 90905a2ade9..612c0a08ad7 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1259,7 +1259,7 @@ to map charsets to scripts.")
&optional _style-variant _noerror)
"Create a fontset from fontset specification string FONTSET-SPEC.
FONTSET-SPEC is a string of the format:
- FONTSET-NAME,SCRIPT-NAME0:FONT-NAME0,SCRIPT-NAME1:FONT-NAME1, ...
+ FONTSET-NAME[,SCRIPT-NAME0:FONT-NAME0,SCRIPT-NAME1:FONT-NAME1] ...
Any number of SPACE, TAB, and NEWLINE can be put before and after commas.
When a frame uses the fontset as the `font' parameter, the frame's