From 3f7e303108f27e6620a5246aba6858011f4a24e0 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Wed, 20 Dec 2000 14:10:20 +0000 Subject: [PATCH] (try_cursor_movement): If we end on a partially visible line, end we already decided to scroll, return -1. --- src/ChangeLog | 3 +++ src/xdisp.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 54520308f72..6814ea02fbf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2000-12-20 Gerd Moellmann + * xdisp.c (try_cursor_movement): If we end on a partially + visible line, end we already decided to scroll, return -1. + * dispextern.h (ensure_frame_matrix): Add prototype. * window.c (delete_window, Fsplit_window) diff --git a/src/xdisp.c b/src/xdisp.c index 7fc606fed81..8a9e063ce1c 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -9250,7 +9250,6 @@ try_cursor_movement (window, startp, scroll_step) int scroll_p = 0; int last_y = window_text_bottom_y (w) - this_scroll_margin; - if (PT > XFASTINT (w->last_point)) { /* Point has moved forward. */ @@ -9336,7 +9335,9 @@ try_cursor_movement (window, startp, scroll_step) /* If we end up in a partially visible line, let's make it fully visible, except when it's taller than the window, in which case we can't do much about it. */ - if (row->height > window_box_height (w)) + if (scroll_p) + rc = -1; + else if (row->height > window_box_height (w)) { *scroll_step = 1; rc = -1; -- 2.39.2