* simple.el (line-move): Adapt to new return value from

pos-visible-in-window-p.

diff --git a/lisp/simple.el b/lisp/simple.el
index 02ce351c50b75efcfc245d0832a001e7e30eee77..3db2a418f3b50dcb23fcf38535ea99148e063039 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3183,17 +3183,17 @@ Outline mode sets this."
 (defun line-move (arg &optional noerror to-end)
   (if auto-window-vscroll
       (let ((forward (> arg 0))
-           (pvis (pos-visible-in-window-p (point) nil t)))
-       (if (and pvis (null (nth 2 pvis))
-                (> (nth (if forward 4 3) pvis) 0))
+           (part (nth 2 (pos-visible-in-window-p (point) nil t))))
+       (if (and (consp part)
+                (> (setq part (if forward (cdr part) (car part))) 0))
            (set-window-vscroll nil
                                (if forward
                                    (+ (window-vscroll nil t)
-                                      (min (nth 4 pvis)
+                                      (min part
                                            (* (frame-char-height) arg)))
                                  (max 0
                                       (- (window-vscroll nil t)
-                                         (min (nth 3 pvis)
+                                         (min part
                                               (* (frame-char-height) (- arg))))))
                                t)
          (set-window-vscroll nil 0)