Mercurial > emacs
diff lisp/gnus/gnus-art.el @ 90201:fbb2bea03df9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Jul 2005 08:02:00 +0000 |
parents | f9a65d7ebd29 7f2745a4e8c5 |
children | 187d6a1f84f7 |
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el Thu Jul 07 12:43:14 2005 +0000 +++ b/lisp/gnus/gnus-art.el Thu Jul 14 08:02:00 2005 +0000 @@ -5160,7 +5160,7 @@ If end of article, return non-nil. Otherwise return nil. Argument LINES specifies lines to be scrolled up." (interactive "p") - (move-to-window-line -1) + (move-to-window-line (max (- -1 scroll-margin) (- -1 (window-body-height)))) (if (save-excursion (end-of-line) (and (pos-visible-in-window-p) ;Not continuation line. @@ -5189,13 +5189,13 @@ (end-of-buffer ;; Long lines may cause an end-of-buffer error. (goto-char (point-max))))) - (move-to-window-line 0)) + (move-to-window-line (min scroll-margin (window-body-height)))) (defun gnus-article-prev-page (&optional lines) "Show previous page of current article. Argument LINES specifies lines to be scrolled down." (interactive "p") - (move-to-window-line 0) + (move-to-window-line (min scroll-margin (window-body-height))) (if (and gnus-page-broken (bobp) (not (save-restriction (widen) (bobp)))) ;Real beginning-of-buffer? @@ -5209,7 +5209,7 @@ (scroll-down lines) (beginning-of-buffer (goto-char (point-min)))) - (move-to-window-line 0))))) + (move-to-window-line (min scroll-margin (window-body-height))))))) (defun gnus-article-only-boring-p () "Decide whether there is only boring text remaining in the article.