Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2345ce..1d52c0f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-18  Simon Josefsson  <jas@extundo.com>
+
+       * gnus-art.el (gnus-button-man-handler): Change default to
+       `manual-entry' (defined in both emacsen).
+       (gnus-button-man-handler): Remove emacsen difference and use
+       `manual-entry'.
+
 2002-10-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * spam.el: Wrap autoload settings for bbdb-records,

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 5ba656f..09bdea8 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5814,14 +5814,11 @@ after replacing with the original article."
   :group 'gnus-article-buttons
   :type 'regexp)
 
-(defcustom gnus-button-man-handler (if (featurep 'xemacs)
-                                      'manual-entry
-                                    'man)
+(defcustom gnus-button-man-handler 'manual-entry
   "Function to use for displaying man pages.
 The function must take at least one argument with a string naming the
 man page."
-  :type '(choice (function-item :tag "Man (Emacs)" man)
-                (function-item :tag "Man (XEmacs)" manual-entry)
+  :type '(choice (function-item :tag "Man" manual-entry)
                 (function-item :tag "Woman" woman)
                 (function :tag "Other"))
   :group 'gnus-article-buttons)