aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-10-01 21:19:22 +0000
committerRichard M. Stallman2007-10-01 21:19:22 +0000
commitf7a7f4eb9a64b2d427f64dd854a45c405ffde917 (patch)
treefc37e5db0871e5550c4988ece9c2065b1a649221
parent16635351f56883730e7cb89959695173244e7c8e (diff)
downloademacs-f7a7f4eb9a64b2d427f64dd854a45c405ffde917.tar.gz
emacs-f7a7f4eb9a64b2d427f64dd854a45c405ffde917.zip
(Overlay Properties): Explain nil as priority. Explain that conflicts
are unpredictable if not resolved by priorities.
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/display.texi22
2 files changed, 21 insertions, 7 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 9e16ae4500c..84546f303fe 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
12007-10-01 Richard Stallman <rms@gnu.org>
2
3 * display.texi (Overlay Properties): Explain nil as priority.
4 Explain that conflicts are unpredictable if not resolved by
5 priorities.
6
12007-09-23 Richard Stallman <rms@gnu.org> 72007-09-23 Richard Stallman <rms@gnu.org>
2 8
3 * macros.texi (Backquote): Minor clarification. 9 * macros.texi (Backquote): Minor clarification.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 7ad3f2cc2be..d0875dd36d4 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1291,6 +1291,11 @@ while moving an overlay or changing its properties does not. Unlike
1291text property changes, overlay property changes are not recorded in 1291text property changes, overlay property changes are not recorded in
1292the buffer's undo list. 1292the buffer's undo list.
1293 1293
1294 Since more than one overlay can specify a property value for the
1295same character, Emacs lets you specify a priority value of each
1296overlay. You should not make assumptions about which overlay will
1297prevail when there is a conflict and they have the same priority.
1298
1294 These functions read and set the properties of an overlay: 1299 These functions read and set the properties of an overlay:
1295 1300
1296@defun overlay-get overlay prop 1301@defun overlay-get overlay prop
@@ -1321,13 +1326,16 @@ of them:
1321@item priority 1326@item priority
1322@kindex priority @r{(overlay property)} 1327@kindex priority @r{(overlay property)}
1323This property's value (which should be a nonnegative integer number) 1328This property's value (which should be a nonnegative integer number)
1324determines the priority of the overlay. The priority matters when two 1329determines the priority of the overlay. No priority, or @code{nil},
1325or more overlays cover the same character and both specify the same 1330means zero.
1326property; the one whose @code{priority} value is larger takes priority 1331
1327over the other. For the @code{face} property, the higher priority 1332The priority matters when two or more overlays cover the same
1328value does not completely replace the other; instead, its face 1333character and both specify the same property; the one whose
1329attributes override the face attributes of the lower priority 1334@code{priority} value is larger overrides the other. For the
1330@code{face} property. 1335@code{face} property, the higher priority overlay's value does not
1336completely override the other value; instead, its face attributes
1337override the face attributes of the lower priority @code{face}
1338property.
1331 1339
1332Currently, all overlays take priority over text properties. Please 1340Currently, all overlays take priority over text properties. Please
1333avoid using negative priority values, as we have not yet decided just 1341avoid using negative priority values, as we have not yet decided just