diff options
| author | Kim F. Storm | 2005-01-23 13:28:16 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2005-01-23 13:28:16 +0000 |
| commit | 257a694c19b6d1b3369820a9c06a807f52087026 (patch) | |
| tree | 965742ebdb2531f9150ca1bb1c8f4b1feeafe6d3 | |
| parent | 5b1ba1e3304c28668adcf1891458348fb25e8c50 (diff) | |
| download | emacs-257a694c19b6d1b3369820a9c06a807f52087026.tar.gz emacs-257a694c19b6d1b3369820a9c06a807f52087026.zip | |
* simple.el (line-move): Adapt to new return value from
pos-visible-in-window-p.
| -rw-r--r-- | lisp/simple.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 02ce351c50b..3db2a418f3b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3183,17 +3183,17 @@ Outline mode sets this." | |||
| 3183 | (defun line-move (arg &optional noerror to-end) | 3183 | (defun line-move (arg &optional noerror to-end) |
| 3184 | (if auto-window-vscroll | 3184 | (if auto-window-vscroll |
| 3185 | (let ((forward (> arg 0)) | 3185 | (let ((forward (> arg 0)) |
| 3186 | (pvis (pos-visible-in-window-p (point) nil t))) | 3186 | (part (nth 2 (pos-visible-in-window-p (point) nil t)))) |
| 3187 | (if (and pvis (null (nth 2 pvis)) | 3187 | (if (and (consp part) |
| 3188 | (> (nth (if forward 4 3) pvis) 0)) | 3188 | (> (setq part (if forward (cdr part) (car part))) 0)) |
| 3189 | (set-window-vscroll nil | 3189 | (set-window-vscroll nil |
| 3190 | (if forward | 3190 | (if forward |
| 3191 | (+ (window-vscroll nil t) | 3191 | (+ (window-vscroll nil t) |
| 3192 | (min (nth 4 pvis) | 3192 | (min part |
| 3193 | (* (frame-char-height) arg))) | 3193 | (* (frame-char-height) arg))) |
| 3194 | (max 0 | 3194 | (max 0 |
| 3195 | (- (window-vscroll nil t) | 3195 | (- (window-vscroll nil t) |
| 3196 | (min (nth 3 pvis) | 3196 | (min part |
| 3197 | (* (frame-char-height) (- arg)))))) | 3197 | (* (frame-char-height) (- arg)))))) |
| 3198 | t) | 3198 | t) |
| 3199 | (set-window-vscroll nil 0) | 3199 | (set-window-vscroll nil 0) |