[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/dispnew.c
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/dispnew.c |
Date: |
Fri, 29 Aug 2003 12:17:39 -0400 |
Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.318 emacs/src/dispnew.c:1.319
*** emacs/src/dispnew.c:1.318 Mon Jun 2 16:39:12 2003
--- emacs/src/dispnew.c Fri Aug 29 12:17:38 2003
***************
*** 625,644 ****
int left = -1, right = -1;
int window_width = -1, window_height;
! /* See if W had a header line that has disappeared now, or vice versa. */
if (w)
{
header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
header_line_changed_p = header_line_p != matrix->header_line_p;
}
matrix->header_line_p = header_line_p;
! /* Do nothing if MATRIX' size, position, vscroll, and marginal areas
haven't changed. This optimization is important because preserving
the matrix means preventing redisplay. */
if (matrix->pool == NULL)
{
- window_box (w, -1, 0, 0, &window_width, &window_height);
left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols);
right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols);
xassert (left >= 0 && right >= 0);
--- 625,647 ----
int left = -1, right = -1;
int window_width = -1, window_height;
! /* See if W had a header line that has disappeared now, or vice versa.
! Get W's size. */
if (w)
{
+ window_box (w, -1, 0, 0, &window_width, &window_height);
+
header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
header_line_changed_p = header_line_p != matrix->header_line_p;
}
matrix->header_line_p = header_line_p;
! /* If POOL is null, MATRIX is a window matrix for window-based redisplay.
! Do nothing if MATRIX' size, position, vscroll, and marginal areas
haven't changed. This optimization is important because preserving
the matrix means preventing redisplay. */
if (matrix->pool == NULL)
{
left = margin_glyphs_to_reserve (w, dim.width, w->left_margin_cols);
right = margin_glyphs_to_reserve (w, dim.width, w->right_margin_cols);
xassert (left >= 0 && right >= 0);
***************
*** 723,729 ****
else
{
/* If MATRIX->pool is null, MATRIX is responsible for managing
! its own memory. Allocate glyph memory from the heap. */
if (dim.width > matrix->matrix_w
|| new_rows
|| header_line_changed_p
--- 726,733 ----
else
{
/* If MATRIX->pool is null, MATRIX is responsible for managing
! its own memory. It is a window matrix for window-based redisplay.
! Allocate glyph memory from the heap. */
if (dim.width > matrix->matrix_w
|| new_rows
|| header_line_changed_p
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/src/dispnew.c,
Richard M. Stallman <=