From 6cbae2010fac31df860b314bbc35fd0e14231893 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 14 Jul 2005 11:43:49 +0000 Subject: [PATCH] Synch to No Gnus 200507140547. --- lisp/ChangeLog | 5 +++++ lisp/gnus-art.el | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b425bfa..87a61a4 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 93d9289..64d03fb 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -5516,7 +5516,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. @@ -5545,13 +5545,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? @@ -5565,7 +5565,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. -- 1.7.10.4