diff options
| author | Gerd Moellmann | 2000-09-21 18:41:57 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-09-21 18:41:57 +0000 |
| commit | 4da61803184cb96c97e0feac8adb99d3ebc2e54d (patch) | |
| tree | 803c871e342c6475c1eefa13df274bb59d61df17 /src | |
| parent | bfdcafe17b68b9398d73839d6a911626680f1b71 (diff) | |
| download | emacs-4da61803184cb96c97e0feac8adb99d3ebc2e54d.tar.gz emacs-4da61803184cb96c97e0feac8adb99d3ebc2e54d.zip | |
(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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 816ea6debf7..899e0d2fa9b 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -9745,7 +9745,6 @@ try_window_reusing_current_matrix (w) | |||
| 9745 | struct glyph_row *last_reused_text_row; | 9745 | struct glyph_row *last_reused_text_row; |
| 9746 | struct glyph_row *start_row; | 9746 | struct glyph_row *start_row; |
| 9747 | int start_vpos, min_y, max_y; | 9747 | int start_vpos, min_y, max_y; |
| 9748 | |||
| 9749 | 9748 | ||
| 9750 | if (/* This function doesn't handle terminal frames. */ | 9749 | if (/* This function doesn't handle terminal frames. */ |
| 9751 | !FRAME_WINDOW_P (f) | 9750 | !FRAME_WINDOW_P (f) |
| @@ -10017,6 +10016,8 @@ try_window_reusing_current_matrix (w) | |||
| 10017 | run.current_y = first_reusable_row->y; | 10016 | run.current_y = first_reusable_row->y; |
| 10018 | run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); | 10017 | run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
| 10019 | run.height = it.last_visible_y - run.current_y; | 10018 | run.height = it.last_visible_y - run.current_y; |
| 10019 | dy = run.current_y - run.desired_y; | ||
| 10020 | |||
| 10020 | if (run.height) | 10021 | if (run.height) |
| 10021 | { | 10022 | { |
| 10022 | struct frame *f = XFRAME (WINDOW_FRAME (w)); | 10023 | struct frame *f = XFRAME (WINDOW_FRAME (w)); |
| @@ -10031,7 +10032,6 @@ try_window_reusing_current_matrix (w) | |||
| 10031 | /* Adjust Y positions of reused rows. */ | 10032 | /* Adjust Y positions of reused rows. */ |
| 10032 | bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); | 10033 | bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w); |
| 10033 | row = first_reusable_row; | 10034 | row = first_reusable_row; |
| 10034 | dy = first_reusable_row->y; | ||
| 10035 | min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); | 10035 | min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w); |
| 10036 | max_y = it.last_visible_y; | 10036 | max_y = it.last_visible_y; |
| 10037 | while (row < first_row_to_display) | 10037 | while (row < first_row_to_display) |