(init_from_display_pos): Pop until the iterator's

stack is empty; there may be frames for stretch or images
on the stack.

src/ChangeLog

 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.

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)