summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-07 22:37:54 +0200
committerLars Magne Ingebrigtsen <larsi@gnus.org>2011-07-07 22:37:54 +0200
commitd94d85e91ecc322f5d65660957335c60a810bc4c (patch)
tree0c0aff12e8a8da5229563e5e326964d4ade452f7
parent538e85c63902c82983dcdd063b6c5c3d78359517 (diff)
downloademacs-d94d85e91ecc322f5d65660957335c60a810bc4c.tar.gz
* text.texi (Special Properties): Clarify the format of `face'
Fixes: debbugs:1375
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/text.texi7
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 773321f3c67..7e8dac0cb27 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
2011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
+ * text.texi (Special Properties): Clarify the format of `face'
+ (bug#1375).
+
* commands.texi (Interactive Call): Add a `call-interactively'
example (bug#1010).
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 7d2c3831a5a..2d487352243 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -2978,8 +2978,7 @@ character.
You can use the property @code{face} to control the font and color of
text. @xref{Faces}, for more information.
-In the simplest case, the value is a face name. It can also be a list;
-then each element can be any of these possibilities;
+@code{face} can be the following:
@itemize @bullet
@item
@@ -2994,8 +2993,8 @@ time you want to specify a particular attribute for certain text.
@xref{Face Attributes}.
@end itemize
-It works to use the latter two forms directly as the value
-of the @code{face} property.
+@code{face} can also be a list, where each element uses one of the
+forms listed above.
Font Lock mode (@pxref{Font Lock Mode}) works in most buffers by
dynamically updating the @code{face} property of characters based on