procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #18419 with disappearing line numbers when minibuffer is resized.

Browse source 
src/dispnew.c (prepare_desired_row): When MODE_LINE_P is zero,
 always make sure the marginal areas of the row are in sync with
 what the window wants.
This commit is contained in:
Eli Zaretskii 2014-09-07 20:16:36 +03:00
parent 6ac5571c62
commit 938aed6ef8
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-09-07 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (prepare_desired_row): When MODE_LINE_P is zero,
always make sure the marginal areas of the row are in sync with
what the window wants. (Bug#18419)
2014-09-04 Eli Zaretskii <eliz@gnu.org>
* data.c (set_internal): Use assq_no_quit, not Fassq, to find an

7
src/dispnew.c
View file

@ -1083,8 +1083,7 @@ prepare_desired_row (struct window *w, struct glyph_row *row, bool mode_line_p)
if (w->right_margin_cols > 0)
row->glyphs[RIGHT_MARGIN_AREA] = row->glyphs[LAST_AREA];
}
else if (row == MATRIX_MODE_LINE_ROW (w->desired_matrix)
|| row == MATRIX_HEADER_LINE_ROW (w->desired_matrix))
else
{
/* The real number of glyphs reserved for the margins is
recorded in the glyph matrix, and can be different from
@ -1094,8 +1093,8 @@ prepare_desired_row (struct window *w, struct glyph_row *row, bool mode_line_p)
int right = w->desired_matrix->right_margin_glyphs;
/* Make sure the marginal areas of this row are in sync with
what the window wants, when the 1st/last row of the matrix
actually displays text and not header/mode line. */
what the window wants, when the row actually displays text
and not header/mode line. */
if (w->left_margin_cols > 0
&& (left != row->glyphs[TEXT_AREA] - row->glyphs[LEFT_MARGIN_AREA]))
row->glyphs[TEXT_AREA] = row->glyphs[LEFT_MARGIN_AREA] + left;