From: ShengHuo ZHU <zsh@cs.rochester.edu>
Date: Wed, 18 Sep 2002 17:55:26 +0000 (+0000)
Subject: * gnus-art.el (gnus-article-x-face-command): Don't use
X-Git-Tag: ttn-vms-21-2-B4~13119
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0929139a43a3646c74d4ab0c7580160f1518769f;p=emacs.git

* gnus-art.el (gnus-article-x-face-command): Don't use
	gnus-article-compface-xbm.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6153a7de957..4ae2664327e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-18  Rob Browning <rlb@defaultvalue.org>
+
+	* gnus-art.el (gnus-article-x-face-command): Don't use
+	gnus-article-compface-xbm.
+
 2002-09-06  Juanma Barranquero  <lektu@terra.es>
 
 	* gnus-int.el (gnus-status-message): Fix spacing.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 8201993c7f8..e3ed0683953 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -207,7 +207,8 @@ regexp.  If it matches, the text in question is not a signature."
   (if (and (fboundp 'image-type-available-p)
 	   (image-type-available-p 'xbm))
       'gnus-article-display-xface
-    (if gnus-article-compface-xbm
+    (if (eq 0 (string-match "#define"
+                            (shell-command-to-string "uncompface -X")))
 	"{ echo '/* Width=48, Height=48 */'; uncompface; } | display -"
       "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
 display -"))