[Emacs-diffs] /srv/bzr/emacs/trunk r99402: display.texi (Auto Faces): Say fontification-functions is called

[Alan Mackenzie]

------------------------------------------------------------
revno: 99402
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Thu 2010-01-28 16:24:50 +0000
message:
  display.texi (Auto Faces): Say fontification-functions is called
  whether or not Font Lock is enabled.  Tidy up the wording a bit.
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-01-17 22:24:49 +0000
+++ b/doc/lispref/ChangeLog     2010-01-28 16:24:50 +0000
@@ -1,3 +1,8 @@
+2010-01-28  Alan Mackenzie  <address@hidden>
+
+       * display.texi (Auto Faces): Say fontification-functions is called
+       whether or not Font Lock is enabled.  Tidy up the wording a bit.
+
 2010-01-17  Chong Yidong  <address@hidden>
 
        * elisp.texi: Remove duplicate edition information (Bug#5407).

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2010-01-13 08:35:10 +0000
+++ b/doc/lispref/display.texi  2010-01-28 16:24:50 +0000
@@ -2654,23 +2654,25 @@
 
 @defvar fontification-functions
 This variable holds a list of functions that are called by Emacs
-redisplay as needed to assign faces automatically to text in the buffer.
+redisplay as needed, just before doing redisplay.  They are called even
+when Font Lock Mode isn't enabled.  When Font Lock Mode is enabled, this
+variable usually holds just one function, @code{jit-lock-function}.
 
 The functions are called in the order listed, with one argument, a
-buffer position @var{pos}.  Each function should attempt to assign faces
-to the text in the current buffer starting at @var{pos}.
+buffer position @var{pos}.  Collectively they should attempt to assign
+faces to the text in the current buffer starting at @var{pos}.
 
-Each function should record the faces they assign by setting the
address@hidden property.  It should also add a address@hidden
address@hidden property for all the text it has assigned faces to.
+The functions should record the faces they assign by setting the
address@hidden property.  They should also add a address@hidden
address@hidden property to all the text they have assigned faces to.
 That property tells redisplay that faces have been assigned to that text
 already.
 
-It is probably a good idea for each function to do nothing if the
+It is probably a good idea for the functions to do nothing if the
 character after @var{pos} already has a address@hidden @code{fontified}
 property, but this is not required.  If one function overrides the
-assignments made by a previous one, the properties as they are
-after the last function finishes are the ones that really matter.
+assignments made by a previous one, the properties after the last
+function finishes are the ones that really matter.
 
 For efficiency, we recommend writing these functions so that they
 usually assign faces to around 400 to 600 characters at each call.