[Emacs-diffs] Changes to emacs/lispref/modes.texi,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       06/12/11 02:34:51

Index: modes.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/modes.texi,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- modes.texi  10 Dec 2006 21:10:44 -0000      1.159
+++ modes.texi  11 Dec 2006 02:34:51 -0000      1.160
@@ -2358,9 +2358,12 @@
 @defvar font-lock-defaults
 This variable is set by major modes, as a buffer-local variable, to
 specify how to fontify text in that mode.  It automatically becomes
-buffer-local when you set it.  If its value is @code{nil}, no
-highlighting is performed.  If address@hidden, the value should look
-like this:
+buffer-local when you set it.  If its value is @code{nil}, Font-Lock
+mode does no highlighting, and you can use the @samp{Faces} menu
+(under @samp{Edit} and then @samp{Text Properties} in the menu bar) to
+assign faces explicitly to text in the buffer.
+
+If address@hidden, the value should look like this:
 
 @example
 (@var{keywords} address@hidden address@hidden
@@ -2406,6 +2409,13 @@
 elements.  @xref{Other Font Lock Variables}.
 @end defvar
 
+  If your mode fontifies text explicitly by adding
address@hidden properties, it can specify @code{(nil t)} for
address@hidden to turn off all automatic fontification.
+However, this is not required; it is possible to fontify some things
+using @code{font-lock-face} properties and set up automatic
+fontification for other parts of the text.
+
 @node Search-based Fontification
 @subsection Search-based Fontification