From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 29 May 2020 14:00:52 +0000 (+0300)
Subject: Fix display of line-prefix with fringe bitmaps
X-Git-Tag: emacs-28.0.90~7252
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dc15e70ddd0dd01a24aa181d8ebb4718df0592c9;p=emacs.git

Fix display of line-prefix with fringe bitmaps

* src/xdisp.c (try_window_id): Don't use this optimization 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 f5a8f2eabf8..47246d0690f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20338,6 +20338,12 @@ try_window_id (struct window *w)
 
       if (! init_to_row_end (&it, w, last_unchanged_at_beg_row))
 	GIVE_UP (18);
+      /* Give up if the row starts with a display property that draws
+	 on the fringes, since that could prevent correct display of
+	 line-prefix and wrap-prefix.  */
+      if (it.sp > 1
+	  && it.method == GET_FROM_IMAGE && it.image_id == -1)
+	GIVE_UP (26);
       start_pos = it.current.pos;
 
       /* Start displaying new lines in the desired matrix at the same