# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1108855829 0
# Node ID 9440f8bb9f71162c4bcf9080a63ae845db98f2e2
# Parent  658a49292dae94d81fe86dca7bec751bf21049b4
(line-move): Add fourth optional arg try-vscroll which
must be set to perform auto-window-vscroll.
When moving backwards and doing auto-window-vscroll, automatically
vscroll to the last part of lines which are taller than the window.
(next-line, previous-line): Set try-vscroll arg on line-move.

diff -r 658a49292dae -r 9440f8bb9f71 lisp/simple.el
--- a/lisp/simple.el	Sat Feb 19 23:30:12 2005 +0000
+++ b/lisp/simple.el	Sat Feb 19 23:30:29 2005 +0000
@@ -3158,12 +3158,12 @@
 	  (let ((abbrev-mode nil))
 	    (end-of-line)
 	    (insert "\n"))
-	(line-move arg))
+	(line-move arg nil nil t))
     (if (interactive-p)
 	(condition-case nil
-	    (line-move arg)
+	    (line-move arg nil nil t)
 	  ((beginning-of-buffer end-of-buffer) (ding)))
-      (line-move arg)))
+      (line-move arg nil nil t)))
   nil)
 
 (defun previous-line (&optional arg)
@@ -3186,9 +3186,9 @@
   (or arg (setq arg 1))
   (if (interactive-p)
       (condition-case nil
-	  (line-move (- arg))
+	  (line-move (- arg) nil nil t)
 	((beginning-of-buffer end-of-buffer) (ding)))
-    (line-move (- arg)))
+    (line-move (- arg) nil nil t))
   nil)
 
 (defcustom track-eol nil
@@ -3227,8 +3227,8 @@
 	  (assq prop buffer-invisibility-spec)))))
 
 ;; Perform vertical scrolling of tall images if necessary.
-(defun line-move (arg &optional noerror to-end)
-  (if auto-window-vscroll
+(defun line-move (arg &optional noerror to-end try-vscroll)
+  (if (and auto-window-vscroll try-vscroll)
       (let ((forward (> arg 0))
 	    (part (nth 2 (pos-visible-in-window-p (point) nil t))))
 	(if (and (consp part)
@@ -3244,7 +3244,14 @@
 					       (* (frame-char-height) (- arg))))))
 				t)
 	  (set-window-vscroll nil 0)
-	  (line-move-1 arg noerror to-end)))
+	  (when (line-move-1 arg noerror to-end)
+	    (sit-for 0)
+	    (if (and (not forward)
+		     (setq part (nth 2 (pos-visible-in-window-p
+					(line-beginning-position) nil t)))
+		     (> (cdr part) 0))
+		(set-window-vscroll nil (cdr part) t))
+	    t)))
     (line-move-1 arg noerror to-end)))
 
 ;; This is the guts of next-line and previous-line.