# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1126130376 0
# Node ID 5780229616e2a612e1b1f97c18aaa6c0b1533c8e
# Parent  61809205ec7effede9d1e4ad9ab17fb73ac4ea85
* xdisp.c (handle_display_prop): Respect overlay window property.

diff -r 61809205ec7e -r 5780229616e2 src/xdisp.c
--- 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)