From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 31 Mar 2008 22:37:54 +0000 (+0000)
Subject: (next_overlay_string): Don't set overlay_strings_at_end_processed_p if
X-Git-Tag: emacs-pretest-22.2.90~265
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3977f0437fcd86bc08282d48b46edcc4195b4880;p=emacs.git

(next_overlay_string): Don't set overlay_strings_at_end_processed_p if
we're currently reading from a display string.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 7a64b9743da..f20aaedd2f7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4674,7 +4674,7 @@ next_overlay_string (it)
       /* 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