diff options
Diffstat (limited to 'lisp/follow.el')
| -rw-r--r-- | lisp/follow.el | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/lisp/follow.el b/lisp/follow.el index acc2b26c550..faac87986bb 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -557,7 +557,7 @@ This is an internal function for `follow-scroll-up' and (let ((opoint (point)) (owin (selected-window))) (while ;; If we are too near EOB, try scrolling the previous window. - (condition-case nil (progn (scroll-up arg) nil) + (condition-case nil (progn (scroll-up-command arg) nil) (end-of-buffer (condition-case nil (progn (follow-previous-window) t) (error @@ -576,7 +576,7 @@ If ARG is nil, scroll the size of the current window. This is an internal function for `follow-scroll-down' and `follow-scroll-down-window'." (let ((opoint (point))) - (scroll-down arg) + (scroll-down-command arg) (unless (and scroll-preserve-screen-position (get this-command 'scroll-command)) (goto-char opoint)) @@ -596,7 +596,7 @@ Negative ARG means scroll downward. Works like `scroll-up' when not in Follow mode." (interactive "P") (cond ((not follow-mode) - (scroll-up arg)) + (scroll-up-command arg)) ((eq arg '-) (follow-scroll-down-window)) (t (follow-scroll-up-arg arg)))) @@ -616,7 +616,7 @@ Negative ARG means scroll upward. Works like `scroll-down' when not in Follow mode." (interactive "P") (cond ((not follow-mode) - (scroll-down arg)) + (scroll-down-command arg)) ((eq arg '-) (follow-scroll-up-window)) (t (follow-scroll-down-arg arg)))) @@ -635,13 +635,16 @@ Negative ARG means scroll downward. Works like `scroll-up' when not in Follow mode." (interactive "P") (cond ((not follow-mode) - (scroll-up arg)) + (scroll-up-command arg)) (arg (follow-scroll-up-arg arg)) (t (let* ((windows (follow-all-followers)) (end (window-end (car (reverse windows))))) (if (eq end (point-max)) - (signal 'end-of-buffer nil) + (if (or (null scroll-error-top-bottom) + (eobp)) + (signal 'end-of-buffer nil) + (goto-char (point-max))) (select-window (car windows)) ;; `window-end' might return nil. (if end @@ -663,14 +666,17 @@ Negative ARG means scroll upward. Works like `scroll-down' when not in Follow mode." (interactive "P") (cond ((not follow-mode) - (scroll-down arg)) + (scroll-down-command arg)) (arg (follow-scroll-down-arg arg)) (t (let* ((windows (follow-all-followers)) (win (car (reverse windows))) (start (window-start (car windows)))) (if (eq start (point-min)) - (signal 'beginning-of-buffer nil) + (if (or (null scroll-error-top-bottom) + (bobp)) + (signal 'beginning-of-buffer nil) + (goto-char (point-min))) (select-window win) (goto-char start) (vertical-motion (- (- (window-height win) |