2 files changed, 21 insertions, 11 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 85bf600cf2d..992c351ef31 100644
--- 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 3b2dd8cb994..f7e3420e922 100644
--- 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.