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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0cfb313..14b9a91 100644 (file)
--- 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 41383cb..b87022c 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -220,20 +220,27 @@ 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
-  (if (and (fboundp 'image-type-available-p)
-          (image-type-available-p 'xbm))
-      'gnus-article-display-xface
-    (if gnus-article-compface-xbm
-       "{ echo '/* Width=48, Height=48 */'; uncompface; } | display -"
-      "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
-display -"))
+  (if (featurep 'xemacs)
+      (if (or (featurep 'xface)
+             (featurep 'xpm))
+         'gnus-xmas-article-display-xface
+       "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -")
+    (if (and (fboundp 'image-type-available-p)
+            (image-type-available-p 'xbm))
+       'gnus-article-display-xface
+      (if gnus-article-compface-xbm
+         "{ echo '/* Width=48, Height=48 */'; uncompface; } | display -"
+       "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
+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 gnus-article-display-xface)
+  :type `(choice string
+                (function-item 
+                 ,(if (featurep 'xemacs)
+                      'gnus-xmas-article-display-xface
+                    'gnus-article-display-xface))
                 function)
   :version "21.1"
   :group 'gnus-article-washing)

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 1986602..9e1ff24 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -81,16 +81,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.