Mercurial > emacs

changeset 65361:5780229616e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xdisp.c (handle_display_prop): Respect overlay window property.
author Kim F. Storm <storm@cua.dk>
date Wed, 07 Sep 2005 21:59:36 +0000
parents 61809205ec7e
children 601c1d04dcb1
files src/xdisp.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Wed Sep 07 21:59:11 2005 +0000
+++ b/src/xdisp.c	Wed Sep 07 21:59:36 2005 +0000
@@ -3428,7 +3428,7 @@
     }
   else
     {
-      object = it->w->buffer;
+      XSETWINDOW (object, it->w);
       position = &it->current.pos;
     }
 
@@ -3449,6 +3449,9 @@
   if (NILP (prop))
     return HANDLED_NORMALLY;
 
+  if (!STRINGP (it->string))
+    object = it->w->buffer;
+
   if (CONSP (prop)
       /* Simple properties.  */
       && !EQ (XCAR (prop), Qimage)