From 901e86fde7a877f40f8d3f4a9cc849ba4939d594 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Thu, 14 Jul 2005 05:47:09 +0000 Subject: [PATCH] Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-156 Merge from gnus--rel--5.10 Patches applied: * emacs--cvs-trunk--0 (patch 477, 484) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 92) - Merge from emacs--cvs-trunk--0 2005-07-08 Ralf Angeli (tiny change) * lisp/gnus-art.el (gnus-article-next-page, gnus-article-next-page-1) (gnus-article-prev-page): Take scroll-margin into consideration. --- lisp/ChangeLog | 5 +++++ lisp/gnus-art.el | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6efb33421..2b40c9ba0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -6,6 +6,11 @@ * gnus-topic.el (gnus-topic-mode): Ditto. +2005-07-08 Ralf Angeli (tiny change) + + * gnus-art.el (gnus-article-next-page, gnus-article-next-page-1) + (gnus-article-prev-page): Take scroll-margin into consideration. + 2005-07-04 Lute Kamstra Update FSF's address in GPL notices. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 5c3c0bba7..ae89e4df6 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -5164,7 +5164,7 @@ If given a numerical ARG, move forward ARG pages." 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. @@ -5193,13 +5193,13 @@ Argument LINES specifies lines to be scrolled up." (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? @@ -5213,7 +5213,7 @@ Argument LINES specifies lines to be scrolled down." (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. -- 2.25.1