Mercurial > emacs

changeset 34737:84f309395a36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(try_cursor_movement): If we end on a partially visible line, end we already decided to scroll, return -1.
author Gerd Moellmann <gerd@gnu.org>
date Wed, 20 Dec 2000 14:09:59 +0000
parents 51a0fe34dfc6
children 47f583b0deb6
files src/xdisp.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Wed Dec 20 12:00:57 2000 +0000
+++ b/src/xdisp.c	Wed Dec 20 14:09:59 2000 +0000
@@ -9250,7 +9250,6 @@
 	  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 @@
 	      /* 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;