(try_cursor_movement): If we end on a partially

visible line, end we already decided to scroll, return -1.

diff --git a/src/ChangeLog b/src/ChangeLog
index 54520308f72cf2648e82473dd7ea1f429925f4b8..6814ea02fbfac0e4799034c7ed648e89a51bf5e0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-20  Gerd Moellmann  <gerd@gnu.org>
 
+       * 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 7fc606fed81db9dd93e0e78870e7596101a1a060..8a9e063ce1c98d8cd2ff51343fea80e2f595afa9 100644 (file)
--- 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;