# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1207003074 0
# Node ID 3aec81c35e117e5f50adb5354cf4b182ffa85e90
# Parent  79a438fa9fa6d415bad3ea7f330da406418f9e40
(next_overlay_string): Don't set overlay_strings_at_end_processed_p if
we're currently reading from a display string.

diff -r 79a438fa9fa6 -r 3aec81c35e11 src/xdisp.c
--- a/src/xdisp.c	Mon Mar 31 22:37:21 2008 +0000
+++ b/src/xdisp.c	Mon Mar 31 22:37:54 2008 +0000
@@ -4674,7 +4674,7 @@
       /* If we're at the end of the buffer, record that we have
 	 processed the overlay strings there already, so that
 	 next_element_from_buffer doesn't try it again.  */
-      if (IT_CHARPOS (*it) >= it->end_charpos)
+      if (NILP (it->string) && IT_CHARPOS (*it) >= it->end_charpos)
 	it->overlay_strings_at_end_processed_p = 1;
 
       /* If we have to display `...' for invisible text, set