aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-09-20 13:20:32 +0000
committerGerd Moellmann2000-09-20 13:20:32 +0000
commit7044c0584d3c47b41ef53ee0aa3fbc9a7e7ad3f7 (patch)
treeb3dda04dddb5a816845ab0433f0b814672ef8216
parent26ff68aad761a7f393ecee4a0d03b1ab85286ac6 (diff)
downloademacs-7044c0584d3c47b41ef53ee0aa3fbc9a7e7ad3f7.tar.gz
emacs-7044c0584d3c47b41ef53ee0aa3fbc9a7e7ad3f7.zip
(gnus-article-display-xface): Don't convert PBM
to XBM; we always have PBM support.
-rw-r--r--lisp/gnus/gnus-ems.el9
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 647c12c27cb..59dd6ae5774 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -208,7 +208,7 @@
208(defun gnus-article-display-xface (beg end) 208(defun gnus-article-display-xface (beg end)
209 "Display an XFace header from between BEG and END in the current article. 209 "Display an XFace header from between BEG and END in the current article.
210Requires support for images in your Emacs and the external programs 210Requires support for images in your Emacs and the external programs
211`uncompface', `icontopbm' and `ppmtoxbm'. On a GNU/Linux system these 211`uncompface', and `icontopbm'. On a GNU/Linux system these
212might be in packages with names like `compface' or `faces-xface' and 212might be in packages with names like `compface' or `faces-xface' and
213`netpbm' or `libgr-progs', for instance. 213`netpbm' or `libgr-progs', for instance.
214 214
@@ -239,18 +239,15 @@ for XEmacs."
239 (eq 0 (call-process-region (point-min) (point-max) 239 (eq 0 (call-process-region (point-min) (point-max)
240 "icontopbm" 240 "icontopbm"
241 'delete '(t nil))) 241 'delete '(t nil)))
242 (eq 0 (call-process-region (point-min) (point-max)
243 "pbmtoxbm"
244 'delete '(t nil)))
245 ;; Miles Bader says that faces don't look right as 242 ;; Miles Bader says that faces don't look right as
246 ;; light on dark. 243 ;; light on dark.
247 (if (eq 'dark (cdr-safe (assq 'background-mode 244 (if (eq 'dark (cdr-safe (assq 'background-mode
248 (frame-parameters)))) 245 (frame-parameters))))
249 (setq image (create-image (buffer-string) 'xbm t 246 (setq image (create-image (buffer-string) 'pbm t
250 :ascent 'center 247 :ascent 'center
251 :foreground "black" 248 :foreground "black"
252 :background "white")) 249 :background "white"))
253 (setq image (create-image (buffer-string) 'xbm t 250 (setq image (create-image (buffer-string) 'pbm t
254 :ascent 'center)))))) 251 :ascent 'center))))))
255 (ring-insert gnus-article-xface-ring-internal (cons data image)))) 252 (ring-insert gnus-article-xface-ring-internal (cons data image))))
256 (when image 253 (when image