Another fix of display of line-prefix with fringe bitmaps

* src/xdisp.c (redisplay_internal): Don't use "optimization 1"
if a glyph row from which to start display begins with a display
property that draws into the fringes.  (Bug#41584)

diff --git a/src/xdisp.c b/src/xdisp.c
index 47246d0690f368a2528de8a3ddc2903bbd44b459..db0ec683159c5e7fb7ed3dd7eb8f865db8ce5826 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15566,6 +15566,12 @@ redisplay_internal (void)
          if (it.current_x != this_line_start_x)
            goto cancel;
 
+         /* Give up on this optimization if the line starts with a
+            string with display property that draws on the fringes,
+            as that might interfere with line-prefix display.  */
+         if (it.sp > 1
+             && it.method == GET_FROM_IMAGE && it.image_id == -1)
+           goto cancel;
          redisplay_trace ("trying display optimization 1\n");
          w->cursor.vpos = -1;
          overlay_arrow_seen = false;