--- gnus-art.el	15 Jul 2005 08:36:19 +0200	7.103
+++ gnus-art.el	15 Jul 2005 08:50:38 +0200	
@@ -5164,7 +5164,11 @@
 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))))
+  (move-to-window-line (if (and (boundp 'scroll-margin)
+				(fboundp 'window-body-height))
+			   (max (- -1 scroll-margin)
+				(- -1 (window-body-height)))
+			 -1))
   (if (save-excursion
 	(end-of-line)
 	(and (pos-visible-in-window-p)	;Not continuation line.
@@ -5193,13 +5197,19 @@
       (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))))
+  (move-to-window-line (if (and (boundp 'scroll-margin)
+				(fboundp 'window-body-height))
+			   (min scroll-margin (window-body-height))
+			 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 (min scroll-margin (window-body-height)))
+  (move-to-window-line (if (and (boundp 'scroll-margin)
+				(fboundp 'window-body-height))
+			   (min scroll-margin (window-body-height))
+			 0))
   (if (and gnus-page-broken
 	   (bobp)
 	   (not (save-restriction (widen) (bobp)))) ;Real beginning-of-buffer?
@@ -5213,7 +5223,10 @@
 	      (scroll-down lines)
 	    (beginning-of-buffer
 	     (goto-char (point-min))))
-	(move-to-window-line (min scroll-margin (window-body-height)))))))
+	(move-to-window-line (if (and (boundp 'scroll-margin)
+				      (fboundp 'window-body-height))
+				 (min scroll-margin (window-body-height))
+			       0))))))
 
 (defun gnus-article-only-boring-p ()
   "Decide whether there is only boring text remaining in the article.