diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-12-10 19:19:40 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-12-10 19:19:40 +0200 |
| commit | d23158777de46dd23444d00ffa05f46a3597c0e3 (patch) | |
| tree | 6241496edd8a751c9a1a9e6d3da14ab3b3ea02f8 /lisp/faces.el | |
| parent | a829cb8c8bc2bd05abf2e572be29eb53b28a9cf3 (diff) | |
| download | emacs-d23158777de46dd23444d00ffa05f46a3597c0e3.tar.gz | |
Fix fontset documentation inconsistencies for bug#29630
* 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.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index d8ec454e626..950532a2a3a 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -645,7 +645,7 @@ The following attributes are recognized: `:family' VALUE must be a string specifying the font family -\(e.g. \"Monospace\") or a fontset. +\(e.g. \"Monospace\"). `:foundry' @@ -761,9 +761,10 @@ from an X font name: `:font' -Set font-related face attributes from VALUE. VALUE must be a -valid font name or font object. Setting this attribute will also -set the `:family', `:foundry', `:width', `:height', `:weight', +Set font-related face attributes from VALUE. +VALUE must be a valid font name or font object. It can also +be a fontset name. Setting this attribute will also set +the `:family', `:foundry', `:width', `:height', `:weight', and `:slant' attributes. `:inherit' |