masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-07 20:59:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix display glitches with side-by-side windows on TTY frames

Browse source 
* src/dispnew.c (adjust_glyph_matrix, prepare_desired_row): Leave
room for the border glyph only if the window does actually have
the right margin.  (Bug#51521)
This commit is contained in:
Eli Zaretskii 2021-10-31 09:42:09 +02:00
parent 4a96f32def
commit 335a660b4b
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/dispnew.c
View file

@ -475,7 +475,8 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
= row->glyphs[TEXT_AREA] + dim.width - left - right; = row->glyphs[TEXT_AREA] + dim.width - left - right;
/* Leave room for a border glyph. */ /* Leave room for a border glyph. */
if (!FRAME_WINDOW_P (XFRAME (w->frame)) if (!FRAME_WINDOW_P (XFRAME (w->frame))
&& !WINDOW_RIGHTMOST_P (w)) && !WINDOW_RIGHTMOST_P (w)
&& right > 0)
row->glyphs[RIGHT_MARGIN_AREA] -= 1; row->glyphs[RIGHT_MARGIN_AREA] -= 1;
row->glyphs[LAST_AREA] row->glyphs[LAST_AREA]
= row->glyphs[LEFT_MARGIN_AREA] + dim.width; = row->glyphs[LEFT_MARGIN_AREA] + dim.width;
@ -1148,7 +1149,8 @@ prepare_desired_row (struct window *w, struct glyph_row *row, bool mode_line_p)
row->glyphs[RIGHT_MARGIN_AREA] = row->glyphs[LAST_AREA] - right; row->glyphs[RIGHT_MARGIN_AREA] = row->glyphs[LAST_AREA] - right;
/* Leave room for a border glyph. */ /* Leave room for a border glyph. */
if (!FRAME_WINDOW_P (XFRAME (w->frame)) if (!FRAME_WINDOW_P (XFRAME (w->frame))
&& !WINDOW_RIGHTMOST_P (w)) && !WINDOW_RIGHTMOST_P (w)
&& right > 0)
row->glyphs[RIGHT_MARGIN_AREA] -= 1; row->glyphs[RIGHT_MARGIN_AREA] -= 1;
} }
} }