From: yamaoka <yamaoka>
Date: Fri, 18 Oct 2002 03:23:09 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_8-05-quimby~27
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=66667122cdb4b75d20e68f70165faa157a85f064;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2345ce..1d52c0f 100644
--- 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
--- 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)