aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShengHuo ZHU2002-09-21 19:57:11 +0000
committerShengHuo ZHU2002-09-21 19:57:11 +0000
commit3cc82ee4989bd4bae73dfce7436b2750ab56210b (patch)
treeeddf2c262f2c85058ca8eb711aae175671c949a3
parent282f7831569ea9d59734a69ccfd81758513a528f (diff)
downloademacs-3cc82ee4989bd4bae73dfce7436b2750ab56210b.tar.gz
emacs-3cc82ee4989bd4bae73dfce7436b2750ab56210b.zip
* gnus-art.el (gnus-article-x-face-command): Use
gnus-article-compface-xbm if bound.
-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 @@
12002-09-21 Rob Browning <rlb@defaultvalue.org>
2
3 * gnus-art.el (gnus-article-x-face-command): Use
4 gnus-article-compface-xbm if bound.
5
12002-09-18 Rob Browning <rlb@defaultvalue.org> 62002-09-18 Rob Browning <rlb@defaultvalue.org>
2 7
3 * gnus-art.el (gnus-article-x-face-command): Don't use 8 * 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."
207 (if (and (fboundp 'image-type-available-p) 207 (if (and (fboundp 'image-type-available-p)
208 (image-type-available-p 'xbm)) 208 (image-type-available-p 'xbm))
209 'gnus-article-display-xface 209 'gnus-article-display-xface
210 (if (eq 0 (string-match "#define" 210 (if (or (and (boundp 'gnus-article-compface-xbm)
211 (shell-command-to-string "uncompface -X"))) 211 gnus-article-compface-xbm)
212 (eq 0 (string-match "#define"
213 (shell-command-to-string "uncompface -X"))))
212 "{ echo '/* Width=48, Height=48 */'; uncompface; } | display -" 214 "{ echo '/* Width=48, Height=48 */'; uncompface; } | display -"
213 "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \ 215 "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
214display -")) 216display -"))