Fix overlay string display regressions introduced in Emacs 24.5

* src/xdisp.c (pop_it): Reset the flag to ignore overlays at this
buffer position, if we move the iterator to a new position as
result of jumping over text covered by a "replacing" display
property.

* test/redisplay-testsuite.el (test-redisplay-4): Add 2 new tests.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index e7626d1ce25..711fe080b03 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5972,6 +5972,7 @@ pop_it (struct it *it)
 {
   struct iterator_stack_entry *p;
   bool from_display_prop = it->from_disp_prop_p;
+  ptrdiff_t prev_pos = IT_CHARPOS (*it);
 
   eassert (it->sp > 0);
   --it->sp;
@@ -6060,6 +6061,11 @@ pop_it (struct it *it)
                    && IT_STRING_BYTEPOS (*it) == it->bidi_it.bytepos)
                || (CONSP (it->object) && it->method == GET_FROM_STRETCH));
     }
+  /* If we move the iterator over text covered by a display property
+     to a new buffer position, any info about previously seen overlays
+     is no longer valid.  */
+  if (from_display_prop && it->sp == 0 && CHARPOS (it->position) != prev_pos)
+    it->ignore_overlay_strings_at_pos_p = false;
 }