(Examining Properties): Mention overlay priority.

2 files changed, 15 insertions, 7 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index d3ae65be947..0c2c09c3f96 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-09  Richard Stallman  <rms@gnu.org>
+
+        * text.texi (Examining Properties): Mention overlay priority.
+
+        * display.texi (Display Margins): Correct the description
+        of margin display specifications.
+        (Replacing Specs): New subnode broken out of Display Property.
+
 2007-10-05  Juanma Barranquero  <lekktu@gmail.com>
 
         * display.texi (Auto Faces): Fix typo.
diff --git a/lispref/text.texi b/lispref/text.texi
index bad68b7f8ae..906e51c513b 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -2615,13 +2615,13 @@ the @var{prop} property of that symbol.
 This function is like @code{get-text-property}, except that it checks
 overlays first and then text properties.  @xref{Overlays}.
 
-The argument @var{object} may be a string, a buffer, or a window.  If it
-is a window, then the buffer displayed in that window is used for text
-properties and overlays, but only the overlays active for that window
-are considered.  If @var{object} is a buffer, then all overlays in that
-buffer are considered, as well as text properties.  If @var{object} is a
-string, only text properties are considered, since strings never have
-overlays.
+The argument @var{object} may be a string, a buffer, or a window.  If
+it is a window, then the buffer displayed in that window is used for
+text properties and overlays, but only the overlays active for that
+window are considered.  If @var{object} is a buffer, then overlays in
+that buffer are considered first, in order of decreasing priority,
+followed by the text properties.  If @var{object} is a string, only
+text properties are considered, since strings never have overlays.
 @end defun
 
 @defun get-char-property-and-overlay position prop &optional object