aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-03-31 22:37:54 +0000
committerChong Yidong2008-03-31 22:37:54 +0000
commit3977f0437fcd86bc08282d48b46edcc4195b4880 (patch)
treea0ee492c324a75f3c14e369854434cc6abf098f4
parent66cfe827e15b92356100f5a3841a08675b304cb8 (diff)
downloademacs-3977f0437fcd86bc08282d48b46edcc4195b4880.tar.gz
emacs-3977f0437fcd86bc08282d48b46edcc4195b4880.zip
(next_overlay_string): Don't set overlay_strings_at_end_processed_p if
we're currently reading from a display string.
-rw-r--r--src/xdisp.c2
1 files changed, 1 insertions, 1 deletions
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)
4674 /* If we're at the end of the buffer, record that we have 4674 /* If we're at the end of the buffer, record that we have
4675 processed the overlay strings there already, so that 4675 processed the overlay strings there already, so that
4676 next_element_from_buffer doesn't try it again. */ 4676 next_element_from_buffer doesn't try it again. */
4677 if (IT_CHARPOS (*it) >= it->end_charpos) 4677 if (NILP (it->string) && IT_CHARPOS (*it) >= it->end_charpos)
4678 it->overlay_strings_at_end_processed_p = 1; 4678 it->overlay_strings_at_end_processed_p = 1;
4679 4679
4680 /* If we have to display `...' for invisible text, set 4680 /* If we have to display `...' for invisible text, set