Mercurial > emacs
changeset 107217:27eb4f088075
(gnus-treat-display-x-face): Protect against errors (bug#5299).
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 24 Feb 2010 11:40:04 -0500 |
| parents | f824258be7d1 |
| children | 10f33dae12b7 4949f0c38c03 |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-art.el |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Wed Feb 24 10:30:49 2010 -0500 +++ b/lisp/gnus/ChangeLog Wed Feb 24 11:40:04 2010 -0500 @@ -1,3 +1,8 @@ +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> * message.el (message-smtpmail-send-it)
--- a/lisp/gnus/gnus-art.el Wed Feb 24 10:30:49 2010 -0500 +++ b/lisp/gnus/gnus-art.el Wed Feb 24 11:40:04 2010 -0500 @@ -1422,8 +1422,12 @@ (gnus-image-type-available-p 'xbm) (if (featurep 'xemacs) (featurep 'xface) - (and (string-match "^0x" (shell-command-to-string "uncompface")) - (executable-find "icontopbm"))) + (condition-case nil + (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) "Display X-Face headers. Valid values are nil and `head'.