[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 d231587: Fix fontset documentation inconsistencie
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 d231587: Fix fontset documentation inconsistencies for bug#29630 |
Date: |
Sun, 10 Dec 2017 12:32:32 -0500 (EST) |
branch: emacs-26
commit d23158777de46dd23444d00ffa05f46a3597c0e3
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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.
---
doc/lispref/display.texi | 11 ++++++-----
lisp/faces.el | 9 +++++----
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index a505639..7af8d9e 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2241,10 +2241,10 @@ attribute is ignored.
@table @code
@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
@code{font-family-list} (see below) returns a list of available family
-names. @xref{Fontsets}, for information about fontsets.
+names.
@item :foundry
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.
@item :font
-The font used to display the face. Its value should be a font object.
address@hidden Font}, for information about font objects, font specs,
-and font entities.
+The font used to display the face. Its value should be a font object
+or a fontset. @xref{Low-Level Font}, for information about font
+objects, font specs, and font entities. @xref{Fontsets}, for
+information about fontsets.
When specifying this attribute using @code{set-face-attribute}
(@pxref{Attribute Functions}), you may also supply a font spec, a font
diff --git a/lisp/faces.el b/lisp/faces.el
index d8ec454..950532a 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'
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 d231587: Fix fontset documentation inconsistencies for bug#29630,
Eli Zaretskii <=