comparison lisp/simple.el @ 59701:5f125540565b

* simple.el (line-move): Adapt to new return value from pos-visible-in-window-p.

59700:c401b93db575

;; Perform vertical scrolling of tall images if necessary.
(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))
	    (set-window-vscroll nil
				(if forward
				    (+ (window-vscroll nil t)
				       (min (nth 4 pvis)
					    (* (frame-char-height) arg)))
				  (max 0
				       (- (window-vscroll nil t)
					  (min (nth 3 pvis)
					       (* (frame-char-height) (- arg))))))
				t)
	  (set-window-vscroll nil 0)
	  (line-move-1 arg noerror to-end)))
    (line-move-1 arg noerror to-end)))

59701:5f125540565b

;; Perform vertical scrolling of tall images if necessary.
(defun line-move (arg &optional noerror to-end)
  (if auto-window-vscroll
      (let ((forward (> arg 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 part
					    (* (frame-char-height) arg)))
				  (max 0
				       (- (window-vscroll nil t)
					  (min part
					       (* (frame-char-height) (- arg))))))
				t)
	  (set-window-vscroll nil 0)
	  (line-move-1 arg noerror to-end)))
    (line-move-1 arg noerror to-end)))