summaryrefslogtreecommitdiff
path: root/lispref
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2006-11-23 18:36:22 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2006-11-23 18:36:22 +0000
commit6b28caea07879860836a5194a4e7aad769b1f5d6 (patch)
treef48437e84c182eb518a13009224d4147f47569ab /lispref
parent312d24fbde1d80e5ea823de511eb362f16bac582 (diff)
downloademacs-6b28caea07879860836a5194a4e7aad769b1f5d6.tar.gz
(Multiline Font Lock): Rephrase some parts for clarity.
Diffstat (limited to 'lispref')
-rw-r--r--lispref/ChangeLog4
-rw-r--r--lispref/modes.texi21
2 files changed, 16 insertions, 9 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 9f87f71416b..f07016138f8 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-23 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * modes.texi (Multiline Font Lock): Rephrase some parts for clarity.
+
2006-11-10 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* frames.texi (Window System Selections): Remove clipboard from
diff --git a/lispref/modes.texi b/lispref/modes.texi
index d6af11434b9..4f68bb5064b 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -3067,16 +3067,19 @@ will rehighlight the whole construct if any part of it is changed. In
some cases you can do this automatically by setting the
@code{font-lock-multiline} variable, which see.
@item
-Rely on @code{jit-lock-contextually}. This will only rehighlight the part
-of the construct that follows the actual change, and will do it after
-a short delay. This only works if the highlighting of the various
-parts of your multiline construct never depends on text in subsequent
-lines. Since @code{jit-lock-contextually} is activated by default,
-this can be an attractive solution.
+Make sure @code{jit-lock-contextually} is set and rely on it doing its
+job. This will only rehighlight the part of the construct that
+follows the actual change, and will do it after a short delay.
+This only works if the highlighting of the various parts of your
+multiline construct never depends on text in subsequent lines.
+Since @code{jit-lock-contextually} is activated by default, this can
+be an attractive solution.
@item
Place a @code{jit-lock-defer-multiline} property on the construct.
-This works only if @code{jit-lock-contextually} is used, but it can
-handle the case where highlighting depends on subsequent lines.
+This works only if @code{jit-lock-contextually} is used, and with the
+same delay before rehighlighting, but like @code{font-lock-multiline},
+it also handles the case where highlighting depends on
+subsequent lines.
@end itemize
@menu
@@ -3089,7 +3092,7 @@ handle the case where highlighting depends on subsequent lines.
@subsubsection Font Lock Multiline
One way to ensure reliable rehighlighting of multiline Font Lock
-constructs is to put on the text property @code{font-lock-multiline}.
+constructs is to put on them the text property @code{font-lock-multiline}.
It should be present and non-@code{nil} for text that is part of a
multiline construct.