(adjust_glyph_matrix): Don't try to reuse the current

matrix of a window when the header line changes, when
new rows are allocated, or when the width changes.

diff --git a/src/ChangeLog b/src/ChangeLog
index 730fd79e5238197f59e073cea1512a1b8e0226b5..84ca7df882229bbdd82e70a32267c433c478aa78 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-30  Gerd Moellmann  <gerd@gnu.org>
+
+       * dispnew.c (adjust_glyph_matrix): Don't try to reuse the current
+       matrix of a window when the header line changes, when
+       new rows are allocated, or when the width changes.
+
 2001-03-30  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * print.c (Fprin1, Fprin1_to_string, Fprinc, Fprint): Fix last

diff --git a/src/dispnew.c b/src/dispnew.c
index 977a3f9530b7695ac9f24b8c3093294dca6e0cc0..412d59939562bbb106647be6d5e8cfd606e25028 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -790,9 +790,12 @@ adjust_glyph_matrix (w, matrix, x, y, dim)
             upper window).  Invalidate all rows that are no longer part
             of the window.  */
          if (!marginal_areas_changed_p
+             && !header_line_changed_p
+             && new_rows == 0
+             && dim.width == matrix->matrix_w
              && matrix->window_left_x == XFASTINT (w->left)
              && matrix->window_top_y == XFASTINT (w->top)
-             && matrix->window_width == window_box_width (w, -1))
+             && matrix->window_width == window_width)
            {
              i = 0;
              while (matrix->rows[i].enabled_p