diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-01-22 19:57:18 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-01-22 19:57:18 +0200 |
| commit | 3e359626e64c50efe31e3f5965d199cb69bb4a8d (patch) | |
| tree | 45b6f8c6adc3d4264f5ecc40196272a90102b89c | |
| parent | d7995b18e4c7b6ac7b5e31c3c8f5f5db648d3275 (diff) | |
| download | emacs-3e359626e64c50efe31e3f5965d199cb69bb4a8d.tar.gz emacs-3e359626e64c50efe31e3f5965d199cb69bb4a8d.tar.bz2 emacs-3e359626e64c50efe31e3f5965d199cb69bb4a8d.zip | |
src/xdisp.c (init_iterator): Restore a comment lost in transition.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
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 bdfea1e1877..cd96e5916d5 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2746,6 +2746,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; |