diff options
| author | Eli Zaretskii | 2020-05-29 23:02:10 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2020-05-29 23:02:10 +0300 |
| commit | f42db4b6e1598c12924cce4bbe4d67e6d86b7963 (patch) | |
| tree | 821d1a81166aac6fc442f28030926545b1d138c0 /src | |
| parent | 187fe4310834af72ecfcc5068af464c2e5f14b9a (diff) | |
| download | emacs-f42db4b6e1598c12924cce4bbe4d67e6d86b7963.tar.gz emacs-f42db4b6e1598c12924cce4bbe4d67e6d86b7963.zip | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 47246d0690f..db0ec683159 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -15566,6 +15566,12 @@ redisplay_internal (void) | |||
| 15566 | if (it.current_x != this_line_start_x) | 15566 | if (it.current_x != this_line_start_x) |
| 15567 | goto cancel; | 15567 | goto cancel; |
| 15568 | 15568 | ||
| 15569 | /* Give up on this optimization if the line starts with a | ||
| 15570 | string with display property that draws on the fringes, | ||
| 15571 | as that might interfere with line-prefix display. */ | ||
| 15572 | if (it.sp > 1 | ||
| 15573 | && it.method == GET_FROM_IMAGE && it.image_id == -1) | ||
| 15574 | goto cancel; | ||
| 15569 | redisplay_trace ("trying display optimization 1\n"); | 15575 | redisplay_trace ("trying display optimization 1\n"); |
| 15570 | w->cursor.vpos = -1; | 15576 | w->cursor.vpos = -1; |
| 15571 | overlay_arrow_seen = false; | 15577 | overlay_arrow_seen = false; |