2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 94c5f76a76d..c6fa70e4d84 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (get_it_property): Use it->window instead of generating
+        a Lisp object from it->w.
+
 2013-06-09  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (get_it_property): If it->object is a buffer, pass to
diff --git a/src/xdisp.c b/src/xdisp.c
index 5edd4bbbc5f..e1d6b0c9a27 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18977,7 +18977,7 @@ get_it_property (struct it *it, Lisp_Object prop)
   else if (BUFFERP (object))
     {
       position = make_number (IT_CHARPOS (*it));
-      XSETWINDOW (object, it->w);
+      object = it->window;
     }
   else
     return Qnil;