summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-03-30 14:09:29 +0000
committerGerd Moellmann <gerd@gnu.org>2001-03-30 14:09:29 +0000
commit73d75a6228376eb5038a25bc793baaf3b913237d (patch)
tree2baa6d37578ba5c730a57e28bb5040a1ac534946
parentaa15b3e5a60ddd926ae8e10ac99ee4821c3e0062 (diff)
downloademacs-73d75a6228376eb5038a25bc793baaf3b913237d.tar.gz
(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.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/dispnew.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 730fd79e523..84ca7df8822 100644
--- 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 977a3f9530b..412d5993956 100644
--- 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