From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 7 Sep 2014 17:16:36 +0000 (+0300)
Subject: Fix bug #18419 with disappearing line numbers when minibuffer is resized.
X-Git-Tag: emacs-24.3.94~51
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=938aed6ef8c0f6ad609c791b1549580b261a5f12;p=emacs.git

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

 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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a1d604b56d4..e834a2cc161 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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
diff --git a/src/dispnew.c b/src/dispnew.c
index 9725068c72b..5bdcb279be7 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -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;