(gnus-auto-center-summary): `scroll-margin' isn't defined on XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 024da9f..162a5b7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-sum.el (gnus-auto-center-summary): `scroll-margin' isn't defined
+       on XEmacs.
+
 2012-04-10  Philipp Haselwarter  <philipp.haselwarter@gmx.de>  (tiny change)
 
        * gnus-sum.el (gnus-auto-center-summary): Set default to respect

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 51cdcaa..2352d78 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -451,7 +451,7 @@ current article is unread."
   :group 'gnus-summary-maneuvering
   :type 'boolean)
 
-(defcustom gnus-auto-center-summary (max scroll-margin 2)
+(defcustom gnus-auto-center-summary (max (bound-and-true-p scroll-margin) 2)
   "*If non-nil, always center the current summary buffer.
 In particular, if `vertical' do only vertical recentering.  If non-nil
 and non-`vertical', do both horizontal and vertical recentering."