2 files changed, 4 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 357b78cb8f1..34018585de6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-03-08  Gerd Moellmann  <gerd@gnu.org>
 
+        * xdisp.c (handle_display_prop): Use it->w->buffer as object,
+        instead of nil.
+
         * xterm.c (note_mouse_highlight): Handle mouse-face and 
         help-echo in strings.
         (x_y_to_hpos_vpos): Add parameter BUFFER_ONLY_P.
diff --git a/src/xdisp.c b/src/xdisp.c
index 3db708e15c9..23fc0a4b089 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2570,7 +2570,7 @@ handle_display_prop (it)
     }
   else
     {
-      object = Qnil;
+      object = it->w->buffer;
       position = &it->current.pos;
     }