[Emacs-diffs] Changes to emacs/lispref/Attic/text.texi, v [EMACS_22_BASE]

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Richard M. Stallman <rms>       07/10/09 01:25:31

Index: text.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/lispref/Attic/text.texi,v
retrieving revision 1.139.2.5
retrieving revision 1.139.2.6
diff -u -b -r1.139.2.5 -r1.139.2.6
--- text.texi   21 Aug 2007 18:22:03 -0000      1.139.2.5
+++ text.texi   9 Oct 2007 01:25:31 -0000       1.139.2.6
@@ -2615,13 +2615,13 @@
 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