From eeafcea7ee4c253678e842342e0ea8ea0d442f30 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 15 Jun 2011 14:45:28 -0400 Subject: [PATCH] * doc/lispref/text.texi (Special Properties): Clarify role of font-lock-face. --- doc/lispref/ChangeLog | 4 ++++ doc/lispref/text.texi | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f647bb00f91..b6b02686caf 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2011-06-15 Chong Yidong + + * text.texi (Special Properties): Clarify role of font-lock-face. + 2011-06-15 Lars Magne Ingebrigtsen * processes.texi (Process Information): Renamed `process-alive-p' diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 6a3f53c55e2..7d2c3831a5a 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -3003,18 +3003,18 @@ the context. @item font-lock-face @kindex font-lock-face @r{(text property)} -The @code{font-lock-face} property is equivalent to the @code{face} -property when Font Lock mode is enabled. When Font Lock mode is disabled, +This property specifies a value for the @code{face} property that Font +Lock mode should apply to the underlying text. It is one of the +fontification methods used by Font Lock mode, and is useful for +special modes that implement their own highlighting. +@xref{Precalculated Fontification}. When Font Lock mode is disabled, @code{font-lock-face} has no effect. -The @code{font-lock-face} property is useful for special modes that -implement their own highlighting. @xref{Precalculated Fontification}. - @item mouse-face @kindex mouse-face @r{(text property)} -The property @code{mouse-face} is used instead of @code{face} when the -mouse is on or near the character. For this purpose, ``near'' means -that all text between the character and where the mouse is have the same +This property is used instead of @code{face} when the mouse is on or +near the character. For this purpose, ``near'' means that all text +between the character and where the mouse is have the same @code{mouse-face} property value. @item fontified -- 2.39.2