mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-12 09:28:24 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Stefan Monnier 2010-02-24 11:40:04 -05:00
parent f95a5fd02f
commit 86f5c0343d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/gnus/ChangeLog
View File

@ -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)

8
lisp/gnus/gnus-art.el
View File

@ -1422,8 +1422,12 @@ predicate. See Info node `(gnus)Customizing Articles'."
(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'.