procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix fontset documentation inconsistencies for bug#29630

Browse source 
* doc/lispref/display.texi (Face Attributes): Don't document
:family as accepting a fontset.  Document that :font accepts a
fontset.

* lisp/faces.el (set-face-attribute): Doc fix.
This commit is contained in:
Eli Zaretskii 2017-12-10 19:19:40 +02:00
parent a829cb8c8b
commit d23158777d
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/lispref/display.texi
View file

@ -2241,10 +2241,10 @@ attribute is ignored.
@table @code @table @code
@item :family @item :family
Font family or fontset (a string). @xref{Fonts,,, emacs, The GNU Font family name (a string). @xref{Fonts,,, emacs, The GNU
Emacs Manual}, for more information about font families. The function Emacs Manual}, for more information about font families. The function
@code{font-family-list} (see below) returns a list of available family @code{font-family-list} (see below) returns a list of available family
names. @xref{Fontsets}, for information about fontsets. names.
@item :foundry @item :foundry
The name of the @dfn{font foundry} for the font family specified by The name of the @dfn{font foundry} for the font family specified by
@ -2404,9 +2404,10 @@ Normally you do not need to set the stipple attribute, because it is
used automatically to handle certain shades of gray. used automatically to handle certain shades of gray.
@item :font @item :font
The font used to display the face. Its value should be a font object. The font used to display the face. Its value should be a font object
@xref{Low-Level Font}, for information about font objects, font specs, or a fontset. @xref{Low-Level Font}, for information about font
and font entities. objects, font specs, and font entities. @xref{Fontsets}, for
information about fontsets.
When specifying this attribute using @code{set-face-attribute} When specifying this attribute using @code{set-face-attribute}
(@pxref{Attribute Functions}), you may also supply a font spec, a font (@pxref{Attribute Functions}), you may also supply a font spec, a font

9
lisp/faces.el
View file

@ -645,7 +645,7 @@ The following attributes are recognized:
`:family' `:family'
VALUE must be a string specifying the font family VALUE must be a string specifying the font family
\(e.g. \"Monospace\") or a fontset. \(e.g. \"Monospace\").
`:foundry' `:foundry'
@ -761,9 +761,10 @@ from an X font name:
`:font' `:font'
Set font-related face attributes from VALUE. VALUE must be a Set font-related face attributes from VALUE.
valid font name or font object. Setting this attribute will also VALUE must be a valid font name or font object. It can also
set the `:family', `:foundry', `:width', `:height', `:weight', be a fontset name. Setting this attribute will also set
the `:family', `:foundry', `:width', `:height', `:weight',
and `:slant' attributes. and `:slant' attributes.
`:inherit' `:inherit'