Mercurial > emacs
changeset 59701:5f125540565b
* simple.el (line-move): Adapt to new return value from
pos-visible-in-window-p.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sun, 23 Jan 2005 13:28:16 +0000 |
parents | c401b93db575 |
children | b0a08eb3f2eb |
files | lisp/simple.el |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/simple.el Sun Jan 23 13:13:03 2005 +0000 +++ b/lisp/simple.el Sun Jan 23 13:28:16 2005 +0000 @@ -3183,17 +3183,17 @@ (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)