[Emacs-diffs] emacs-24 r117484: Fix bug #18419 with disappearing line numbers when minibuffer is resized.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117484
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18419
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-09-07 20:16:36 +0300
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispnew.c                  dispnew.c-20091113204419-o5vbwnq5f7feedwu-258

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-04 15:09:49 +0000
+++ b/src/ChangeLog     2014-09-07 17:16:36 +0000
@@ -1,3 +1,9 @@
+2014-09-07  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * data.c (set_internal): Use assq_no_quit, not Fassq, to find an

=== modified file 'src/dispnew.c'
--- a/src/dispnew.c     2014-09-02 15:16:42 +0000
+++ b/src/dispnew.c     2014-09-07 17:16:36 +0000
@@ -1083,8 +1083,7 @@
       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 @@
       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;