comparison src/xdisp.c @ 90103:3ebd9bdb4fe5

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-13 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-83 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-89 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-90 Update from CVS: man/calc.texi: Add macro for LaTeX for info output. * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-91 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-94 Update from CVS
author Miles Bader <miles@gnu.org>
date Sun, 13 Feb 2005 07:19:08 +0000
parents 72cf6261961e 582f5e2fbf3a
children 7e3f621f1dd4
comparison
equal deleted inserted replaced
90102:9b4f359c4117 90103:3ebd9bdb4fe5
13925 shift_glyph_matrix (w, current_matrix, 13925 shift_glyph_matrix (w, current_matrix,
13926 first_unchanged_at_end_vpos + dvpos, 13926 first_unchanged_at_end_vpos + dvpos,
13927 bottom_vpos, dy); 13927 bottom_vpos, dy);
13928 13928
13929 if (first_unchanged_at_end_row) 13929 if (first_unchanged_at_end_row)
13930 first_unchanged_at_end_row += dvpos; 13930 {
13931 first_unchanged_at_end_row += dvpos;
13932 if (first_unchanged_at_end_row->y >= it.last_visible_y
13933 || !MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row))
13934 first_unchanged_at_end_row = NULL;
13935 }
13931 13936
13932 /* If scrolling up, there may be some lines to display at the end of 13937 /* If scrolling up, there may be some lines to display at the end of
13933 the window. */ 13938 the window. */
13934 last_text_row_at_end = NULL; 13939 last_text_row_at_end = NULL;
13935 if (dy < 0) 13940 if (dy < 0)
13982 } 13987 }
13983 } 13988 }
13984 13989
13985 /* Update window_end_pos and window_end_vpos. */ 13990 /* Update window_end_pos and window_end_vpos. */
13986 if (first_unchanged_at_end_row 13991 if (first_unchanged_at_end_row
13987 && first_unchanged_at_end_row->y < it.last_visible_y
13988 && !last_text_row_at_end) 13992 && !last_text_row_at_end)
13989 { 13993 {
13990 /* Window end line if one of the preserved rows from the current 13994 /* Window end line if one of the preserved rows from the current
13991 matrix. Set row to the last row displaying text in current 13995 matrix. Set row to the last row displaying text in current
13992 matrix starting at first_unchanged_at_end_row, after 13996 matrix starting at first_unchanged_at_end_row, after
22233 if ((y0 >= r.y && y0 < r.y + r.height) 22237 if ((y0 >= r.y && y0 < r.y + r.height)
22234 || (y1 > r.y && y1 < r.y + r.height) 22238 || (y1 > r.y && y1 < r.y + r.height)
22235 || (r.y >= y0 && r.y < y1) 22239 || (r.y >= y0 && r.y < y1)
22236 || (r.y + r.height > y0 && r.y + r.height < y1)) 22240 || (r.y + r.height > y0 && r.y + r.height < y1))
22237 { 22241 {
22238 if (row->overlapping_p) 22242 /* A header line may be overlapping, but there is no need
22243 to fix overlapping areas for them. KFS 2005-02-12 */
22244 if (row->overlapping_p && !row->mode_line_p)
22239 { 22245 {
22240 if (first_overlapping_row == NULL) 22246 if (first_overlapping_row == NULL)
22241 first_overlapping_row = row; 22247 first_overlapping_row = row;
22242 last_overlapping_row = row; 22248 last_overlapping_row = row;
22243 } 22249 }