Minor cleanup in last commit in get_it_property.

 src/xdisp.c (get_it_property): Use it->window instead of generating
 a Lisp object from it->w.

diff --git a/src/ChangeLog b/src/ChangeLog
index 94c5f76a76dc33f15c038b19542d48ccdefeac14..c6fa70e4d844d4139daddf9d20ec84b25c135610 100644 (file)
--- 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 5edd4bbbc5f335146be16b291fa904c57af6aa13..e1d6b0c9a27bc416ac8a5e4eb69d3fc158922a17 100644 (file)
--- 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;