master f42db4b: Another fix of display of line-prefix with fringe bitmaps

[Eli Zaretskii]

branch: master
commit f42db4b6e1598c12924cce4bbe4d67e6d86b7963
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    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)
---
 src/xdisp.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/xdisp.c b/src/xdisp.c
index 47246d0..db0ec68 100644
--- 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;