diff lispref/text.texi @ 90918:e9f94688a064

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 781-792) - Update from CVS - Merge from gnus--rel--5.10 - Merge from emacs--rel--22 * emacs--rel--22 (patch 33-41) * gnus--rel--5.10 (patch 226-228) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-219
author Miles Bader <miles@gnu.org>
date Mon, 11 Jun 2007 00:58:11 +0000
parents d7172f202ab8 7edf1ae10375
children 988f1edc9674
line wrap: on
line diff
--- a/lispref/text.texi	Fri Jun 08 12:41:25 2007 +0000
+++ b/lispref/text.texi	Mon Jun 11 00:58:11 2007 +0000
@@ -2951,6 +2951,11 @@
 names that control filling and property inheritance.  All other names
 have no standard meaning, and you can use them as you like.
 
+  Note: the properties @code{composition}, @code{display},
+@code{invisible} and @code{intangible} can also cause point to move to
+an acceptable place, after each Emacs command.  @xref{Adjusting
+Point}.
+
 @table @code
 @cindex property category of text character
 @kindex category @r{(text property)}
@@ -3019,24 +3024,11 @@
 
 @item fontified
 @kindex fontified @r{(text property)}
-This property says whether the character has a face assigned to it by font
-locking.  The display engine tests it to decide whether a buffer
-portion needs refontifying before display.  @xref{Auto Faces}.  It
-takes one of three values:
-
-@table @asis
-@item @code{nil}
-Font locking is disabled, or the character's @code{face} property, if
-any, is invalid.
-
-@item @code{defer}
-This value is only used when ``just in time'' font locking is enabled
-and it means that the character's @code{face} property is invalid and
-needs deferred fontification.
-
-@item @code{t}
-The character's @code{face} property, or absence of one, is valid.
-@end table
+This property says whether the text is ready for display.  If
+@code{nil}, Emacs's redisplay routine calls the functions in
+@code{fontification-functions} (@pxref{Auto Faces}) to prepare this
+part of the buffer before it is displayed.  It is used internally by
+the ``just in time'' font locking code.
 
 @item display
 This property activates various features that change the
@@ -3138,6 +3130,10 @@
 the end of the group.  If you try to move point backward into the group,
 point actually moves to the start of the group.
 
+If consecutive characters have unequal non-@code{nil}
+@code{intangible} properties, they belong to separate groups; each
+group is separately treated as described above.
+
 When the variable @code{inhibit-point-motion-hooks} is non-@code{nil},
 the @code{intangible} property is ignored.