From: Kim F. Storm <storm@cua.dk>
Date: Wed, 7 Sep 2005 21:59:36 +0000 (+0000)
Subject: * xdisp.c (handle_display_prop): Respect overlay window property.
X-Git-Tag: emacs-pretest-22.0.90~7235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9eef135dcaf3ac8386cb9c1972960b4f1388e81;p=emacs.git

* xdisp.c (handle_display_prop): Respect overlay window property.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index ab3aae5fb91..33317f4c491 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3428,7 +3428,7 @@ handle_display_prop (it)
     }
   else
     {
-      object = it->w->buffer;
+      XSETWINDOW (object, it->w);
       position = &it->current.pos;
     }
 
@@ -3449,6 +3449,9 @@ handle_display_prop (it)
   if (NILP (prop))
     return HANDLED_NORMALLY;
 
+  if (!STRINGP (it->string))
+    object = it->w->buffer;
+
   if (CONSP (prop)
       /* Simple properties.  */
       && !EQ (XCAR (prop), Qimage)