[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-art.el

[Eli Zaretskii]

Index: emacs/lisp/gnus/gnus-art.el
diff -c emacs/lisp/gnus/gnus-art.el:1.83 emacs/lisp/gnus/gnus-art.el:1.84
*** emacs/lisp/gnus/gnus-art.el:1.83    Mon Jul  4 17:55:12 2005
--- emacs/lisp/gnus/gnus-art.el Fri Jul  8 13:48:33 2005
***************
*** 5160,5166 ****
  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)
    (if (save-excursion
        (end-of-line)
        (and (pos-visible-in-window-p)  ;Not continuation line.
--- 5160,5166 ----
  If end of article, return non-nil.  Otherwise return nil.
  Argument LINES specifies lines to be scrolled up."
    (interactive "p")
!   (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,5201 ****
        (end-of-buffer
         ;; Long lines may cause an end-of-buffer error.
         (goto-char (point-max)))))
!   (move-to-window-line 0))
  
  (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)
    (if (and gnus-page-broken
           (bobp)
           (not (save-restriction (widen) (bobp)))) ;Real beginning-of-buffer?
--- 5189,5201 ----
        (end-of-buffer
         ;; Long lines may cause an end-of-buffer error.
         (goto-char (point-max)))))
!   (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 (min scroll-margin (window-body-height)))
    (if (and gnus-page-broken
           (bobp)
           (not (save-restriction (widen) (bobp)))) ;Real beginning-of-buffer?
***************
*** 5209,5215 ****
              (scroll-down lines)
            (beginning-of-buffer
             (goto-char (point-min))))
!       (move-to-window-line 0)))))
  
  (defun gnus-article-only-boring-p ()
    "Decide whether there is only boring text remaining in the article.
--- 5209,5215 ----
              (scroll-down lines)
            (beginning-of-buffer
             (goto-char (point-min))))
!       (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.