aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2020-05-29 17:00:52 +0300
committerEli Zaretskii2020-05-29 17:00:52 +0300
commitdc15e70ddd0dd01a24aa181d8ebb4718df0592c9 (patch)
treea9198e6b592dbef065d51336de58a699e690680a
parentc74e24eacd2cfb182e2159a23db21cfbec73cced (diff)
downloademacs-dc15e70ddd0dd01a24aa181d8ebb4718df0592c9.tar.gz
emacs-dc15e70ddd0dd01a24aa181d8ebb4718df0592c9.zip
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)
-rw-r--r--src/xdisp.c6
1 files changed, 6 insertions, 0 deletions
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)
20338 20338
20339 if (! init_to_row_end (&it, w, last_unchanged_at_beg_row)) 20339 if (! init_to_row_end (&it, w, last_unchanged_at_beg_row))
20340 GIVE_UP (18); 20340 GIVE_UP (18);
20341 /* Give up if the row starts with a display property that draws
20342 on the fringes, since that could prevent correct display of
20343 line-prefix and wrap-prefix. */
20344 if (it.sp > 1
20345 && it.method == GET_FROM_IMAGE && it.image_id == -1)
20346 GIVE_UP (26);
20341 start_pos = it.current.pos; 20347 start_pos = it.current.pos;
20342 20348
20343 /* Start displaying new lines in the desired matrix at the same 20349 /* Start displaying new lines in the desired matrix at the same