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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed42ba4..c49ba7a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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)

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index d01b9f3..1a66404 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -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'.