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

[Miles Bader]

Index: emacs/lisp/gnus/gnus-art.el
diff -c emacs/lisp/gnus/gnus-art.el:1.87 emacs/lisp/gnus/gnus-art.el:1.88
*** emacs/lisp/gnus/gnus-art.el:1.87    Wed Jul 27 01:46:58 2005
--- emacs/lisp/gnus/gnus-art.el Sun Jul 31 00:12:23 2005
***************
*** 5197,5213 ****
                         1 0)))))))
  
  (defun gnus-article-next-page-1 (lines)
!   (unless (and (not (featurep 'xemacs))
!              (> (symbol-value 'scroll-margin) 0)
!              (<= (count-lines (window-start) (point-max))
!                  (symbol-value 'scroll-margin)))
!     (condition-case ()
!       (let ((scroll-in-place nil))
!         (scroll-up lines))
!       (end-of-buffer
!        ;; Long lines may cause an end-of-buffer error.
!        (goto-char (point-max))))
!     (gnus-article-beginning-of-window)))
  
  (defun gnus-article-prev-page (&optional lines)
    "Show previous page of current article.
--- 5197,5219 ----
                         1 0)))))))
  
  (defun gnus-article-next-page-1 (lines)
!   (when (and (not (featurep 'xemacs))
!            (numberp lines)
!            (> lines 0)
!            (numberp (symbol-value 'scroll-margin))
!            (> (symbol-value 'scroll-margin) 0))
!     ;; Protect against the bug that Emacs 21.x hangs up when scrolling up for
!     ;; too many number of lines if `scroll-margin' is set as two or greater.
!     (setq lines (min lines
!                    (max 0 (- (count-lines (window-start) (point-max))
!                              (symbol-value 'scroll-margin))))))
!   (condition-case ()
!       (let ((scroll-in-place nil))
!       (scroll-up lines))
!     (end-of-buffer
!      ;; Long lines may cause an end-of-buffer error.
!      (goto-char (point-max))))
!   (gnus-article-beginning-of-window))
  
  (defun gnus-article-prev-page (&optional lines)
    "Show previous page of current article.