Commit 86f5c034 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(gnus-treat-display-x-face): Protect against errors (bug#5299).

parent f95a5fd0
2010-02-24 Stefan Monnier <monnier@iro.umontreal.ca>
* gnus-art.el (gnus-treat-display-x-face): Don't burp if
shell-command-to-string signals an error (bug#5299).
2010-02-24 Glenn Morris <rgm@gnu.org> 2010-02-24 Glenn Morris <rgm@gnu.org>
* message.el (message-smtpmail-send-it) * message.el (message-smtpmail-send-it)
......
...@@ -1422,8 +1422,12 @@ predicate. See Info node `(gnus)Customizing Articles'." ...@@ -1422,8 +1422,12 @@ predicate. See Info node `(gnus)Customizing Articles'."
(gnus-image-type-available-p 'xbm) (gnus-image-type-available-p 'xbm)
(if (featurep 'xemacs) (if (featurep 'xemacs)
(featurep 'xface) (featurep 'xface)
(and (string-match "^0x" (shell-command-to-string "uncompface")) (condition-case nil
(executable-find "icontopbm"))) (and (string-match "^0x" (shell-command-to-string "uncompface"))
(executable-find "icontopbm"))
;; shell-command-to-string may signal an error, e.g. if
;; shell-file-name is not found.
(error nil)))
'head) 'head)
"Display X-Face headers. "Display X-Face headers.
Valid values are nil and `head'. Valid values are nil and `head'.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment