(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 655b1312d6502d6c1913b925911c1eb84d3ba12e..c8ff93a44dc3e9c8bbea4cf21aa6acd2e7193a9a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2000-12-23  Gerd Moellmann  <gerd@gnu.org>
 
+       * 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 e4a237940d25fa947471920e410b358b27f1bdda..708c5f170cb660a7f3af393b6d3a70fb5c61e217 100644 (file)
--- 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)