From 60794625ae40882e028cb3fb7d92aebd0a652f68 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 28 Sep 2001 13:10:27 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog    |    5 +++++
 lisp/gnus-art.el  |   38 ++++++++++++++++++++++++++++----------
 lisp/gnus-xmas.el |   10 ----------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b3609c..a180eab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-28 07:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-xmas.el (gnus-article-x-face-command): Merge it into
+	gnus-art.el.
+
 2001-09-27  Simon Josefsson  <jas@extundo.com>
 
 	* gnus-topic.el (gnus-topic-mode-map): Add catchup.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a0b8bb7..bdc81ed 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -230,17 +230,20 @@ regexp.  If it matches, the text in question is not a signature."
 
 ;; Fixme: This isn't the right thing for mixed graphical and and
 ;; non-graphical frames in a session.
-;; gnus-xmas.el overrides this for XEmacs.
 (defcustom gnus-article-x-face-command
   (cond
+   ((featurep 'xemacs)
+    (if (or (featurep 'xface)
+	    (featurep 'xpm))
+	'gnus-xmas-article-display-xface
+      "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -"))
    ((and (fboundp 'image-type-available-p)
 	 (module-installed-p 'x-face-e21))
     'x-face-decode-message-header)
    ((and (fboundp 'image-type-available-p)
 	 (image-type-available-p 'xbm))
     'gnus-article-display-xface)
-   ((and (not (featurep 'xemacs))
-	 window-system
+   ((and window-system
 	 (module-installed-p 'x-face-mule))
     'x-face-mule-gnus-article-display-x-face)
    (gnus-article-compface-xbm
@@ -251,13 +254,28 @@ display -"))
   "*String or function to be executed to display an X-Face header.
 If it is a string, the command will be executed in a sub-shell
 asynchronously.	 The compressed face will be piped to this command."
-  :type '(choice string
-		 (function-item
-		  :tag "x-face-decode-message-header (x-face-e21)"
-		  x-face-decode-message-header)
-		 (function-item gnus-article-display-xface)
-		 (function-item x-face-mule-gnus-article-display-x-face)
-		 function)
+  :type `(choice
+	  ,@(let (x-face-e21 x-face-mule)
+	      (if (featurep 'xemacs)
+		  nil
+		(setq x-face-e21 (module-installed-p 'x-face-e21)
+		      x-face-mule (module-installed-p 'x-face-mule)))
+	      (delq nil
+		    (list
+		     'string
+		     (if (and (featurep 'xemacs)
+			      (or (featurep 'xface)
+				  (featurep 'xpm)))
+			 '(function-item gnus-xmas-article-display-xface))
+		     (if (and x-face-e21
+			      (fboundp 'image-type-available-p))
+			 '(function-item
+			   :tag "x-face-decode-message-header (x-face-e21)"
+			   x-face-decode-message-header))
+		     (if x-face-mule
+			 '(function-item
+			   x-face-mule-gnus-article-display-x-face))
+		     'function))))
   ;;:version "21.1"
   :group 'gnus-article-washing)
 
diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 70acff9..cee9ee9 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -82,16 +82,6 @@ Possibly the `etc' directory has not been installed.")))
   (cdr (assq gnus-xmas-logo-color-style gnus-xmas-logo-color-alist))
   "Colors used for the Gnus logo.")
 
-(defcustom gnus-article-x-face-command
-  (if (or (featurep 'xface)
-	  (featurep 'xpm))
-      'gnus-xmas-article-display-xface
-    "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -")
-  "*String or function to be executed to display an X-Face header.
-If it is a string, the command will be executed in a sub-shell
-asynchronously.	 The compressed face will be piped to this command."
-  :type '(choice string function))
-
 ;;; Internal variables.
 
 ;; Don't warn about these undefined variables.
-- 
1.7.10.4