Merge branch 'master' into xwidget

2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a98c77f3902..a8b9c3bf1c6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (init_iterator): Restore a comment lost in transition.
+
 2015-01-22  Paul Eggert  <eggert@cs.ucla.edu>
 
         Use bool for boolean in xfont.c, xftfont.c, xgselect.c
diff --git a/src/xdisp.c b/src/xdisp.c
index 280be6bd7a1..aec6741dbfc 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2752,6 +2752,8 @@ init_iterator (struct it *it, struct window *w,
         row = MATRIX_HEADER_LINE_ROW (w->desired_matrix);
     }
 
+  /* Clear IT, and set it->object and other IT's Lisp objects to Qnil.
+     Other parts of redisplay rely on that.  */
   memclear (it, sizeof *it);
   it->current.overlay_string_index = -1;
   it->current.dpvec_index = -1;