Mercurial > emacs

changeset 31826:2c8c52a67b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(try_window_reusing_current_matrix): Fix computation of reused rows' y-position in the case window has a header-line, and new window start is greater than old window start.
author Gerd Moellmann <gerd@gnu.org>
date Thu, 21 Sep 2000 18:41:57 +0000
parents 62830644b967
children 7c50babd3f4f
files src/xdisp.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Thu Sep 21 18:41:36 2000 +0000
+++ b/src/xdisp.c	Thu Sep 21 18:41:57 2000 +0000
@@ -9745,7 +9745,6 @@
   struct glyph_row *last_reused_text_row;
   struct glyph_row *start_row;
   int start_vpos, min_y, max_y;
-
   
   if (/* This function doesn't handle terminal frames.  */
       !FRAME_WINDOW_P (f)
@@ -10017,6 +10016,8 @@
       run.current_y = first_reusable_row->y;
       run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
       run.height = it.last_visible_y - run.current_y;
+      dy = run.current_y - run.desired_y;
+      
       if (run.height)
 	{
 	  struct frame *f = XFRAME (WINDOW_FRAME (w));
@@ -10031,7 +10032,6 @@
       /* Adjust Y positions of reused rows.  */
       bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
       row = first_reusable_row;
-      dy = first_reusable_row->y;
       min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
       max_y = it.last_visible_y;
       while (row < first_row_to_display)