Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-498

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 96)

   - Update from CVS

2005-07-26  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-article-next-page-1): Don't scroll if there're
   fewer lines than that of scroll-margin.
   (gnus-article-prev-page): Narrow the range to bind scroll-in-place.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 85bf600cf2d385466125aafbffccb095a26eb66f..992c351ef31b686172d270ad196d4928acafb682 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (gnus-article-next-page-1): Don't scroll if there're
+       fewer lines than that of scroll-margin.
+       (gnus-article-prev-page): Narrow the range to bind scroll-in-place.
+
 2005-07-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-next-page): Revert.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 3b2dd8cb9949c7c735e26b91e231975a101081d8..f7e3420e92203185f56f7b6c82de8c996c26e349 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5197,13 +5197,17 @@ specifies."
                         1 0)))))))
 
 (defun gnus-article-next-page-1 (lines)
-  (let ((scroll-in-place nil))
+  (unless (and (not (featurep 'xemacs))
+              (> (symbol-value 'scroll-margin) 0)
+              (<= (count-lines (window-start) (point-max))
+                  (symbol-value 'scroll-margin)))
     (condition-case ()
-       (scroll-up lines)
+       (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))
+       (goto-char (point-max))))
+    (gnus-article-beginning-of-window)))
 
 (defun gnus-article-prev-page (&optional lines)
   "Show previous page of current article.
@@ -5217,13 +5221,13 @@ Argument LINES specifies lines to be scrolled down."
        (gnus-narrow-to-page -1)        ;Go to previous page.
        (goto-char (point-max))
        (recenter -1))
-    (let ((scroll-in-place nil))
-      (prog1
-         (condition-case ()
-             (scroll-down lines)
-           (beginning-of-buffer
-            (goto-char (point-min))))
-       (gnus-article-beginning-of-window)))))
+    (prog1
+       (condition-case ()
+           (let ((scroll-in-place nil))
+             (scroll-down lines))
+         (beginning-of-buffer
+          (goto-char (point-min))))
+      (gnus-article-beginning-of-window))))
 
 (defun gnus-article-only-boring-p ()
   "Decide whether there is only boring text remaining in the article.