From: Gerd Moellmann Date: Sat, 23 Dec 2000 19:23:24 +0000 (+0000) Subject: (init_from_display_pos): Pop until the iterator's X-Git-Tag: emacs-pretest-21.0.95~294 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aeb2b8fc29df43b11a199b16237da7fcc12b7480;p=emacs.git (init_from_display_pos): Pop until the iterator's stack is empty; there may be frames for stretch or images on the stack. --- diff --git a/src/ChangeLog b/src/ChangeLog index 655b1312d65..c8ff93a44dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2000-12-23 Gerd Moellmann + * xdisp.c (init_from_display_pos): Pop until the iterator's + stack is empty; there may be frames for stretch or images + on the stack. + * dispnew.c (save_frame_matrix, restore_frame_matrix): Removed. (save_or_restore_current_matrix): New function for the same purpose, but more efficient. diff --git a/src/xdisp.c b/src/xdisp.c index e4a237940d2..708c5f170cb 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1765,7 +1765,8 @@ init_from_display_pos (it, w, pos) POS, make sure to pop the iterator because it will be in front of that overlay string. When POS is ZV, we've thereby also ``processed'' overlay strings at ZV. */ - pop_it (it); + while (it->sp) + pop_it (it); it->current.overlay_string_index = -1; it->method = next_element_from_buffer; if (CHARPOS (pos->pos) == ZV)