summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-art.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4ae2664327e..1bd12391229 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-21 Rob Browning <rlb@defaultvalue.org>
+
+ * gnus-art.el (gnus-article-x-face-command): Use
+ gnus-article-compface-xbm if bound.
+
2002-09-18 Rob Browning <rlb@defaultvalue.org>
* gnus-art.el (gnus-article-x-face-command): Don't use
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index e3ed0683953..ae8a7ee732f 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -207,8 +207,10 @@ 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 (eq 0 (string-match "#define"
- (shell-command-to-string "uncompface -X")))
+ (if (or (and (boundp 'gnus-article-compface-xbm)
+ gnus-article-compface-xbm)
+ (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 -"))