aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-07 22:37:54 +0200
committerLars Magne Ingebrigtsen2011-07-07 22:37:54 +0200
commitd94d85e91ecc322f5d65660957335c60a810bc4c (patch)
tree0c0aff12e8a8da5229563e5e326964d4ade452f7
parent538e85c63902c82983dcdd063b6c5c3d78359517 (diff)
downloademacs-d94d85e91ecc322f5d65660957335c60a810bc4c.tar.gz
emacs-d94d85e91ecc322f5d65660957335c60a810bc4c.zip
* 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 @@
12011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-07 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * text.texi (Special Properties): Clarify the format of `face'
4 (bug#1375).
5
3 * commands.texi (Interactive Call): Add a `call-interactively' 6 * commands.texi (Interactive Call): Add a `call-interactively'
4 example (bug#1010). 7 example (bug#1010).
5 8
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.
2978You can use the property @code{face} to control the font and color of 2978You can use the property @code{face} to control the font and color of
2979text. @xref{Faces}, for more information. 2979text. @xref{Faces}, for more information.
2980 2980
2981In the simplest case, the value is a face name. It can also be a list; 2981@code{face} can be the following:
2982then each element can be any of these possibilities;
2983 2982
2984@itemize @bullet 2983@itemize @bullet
2985@item 2984@item
@@ -2994,8 +2993,8 @@ time you want to specify a particular attribute for certain text.
2994@xref{Face Attributes}. 2993@xref{Face Attributes}.
2995@end itemize 2994@end itemize
2996 2995
2997It works to use the latter two forms directly as the value 2996@code{face} can also be a list, where each element uses one of the
2998of the @code{face} property. 2997forms listed above.
2999 2998
3000Font Lock mode (@pxref{Font Lock Mode}) works in most buffers by 2999Font Lock mode (@pxref{Font Lock Mode}) works in most buffers by
3001dynamically updating the @code{face} property of characters based on 3000dynamically updating the @code{face} property of characters based on