[Emacs-diffs] /srv/bzr/emacs/trunk r99551: (gnus-treat-display-x-face): Protect against errors (bug#5299).

[Stefan Monnier]

------------------------------------------------------------
revno: 99551
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-24 11:40:04 -0500
message:
  (gnus-treat-display-x-face): Protect against errors (bug#5299).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-02-24 03:12:54 +0000
+++ b/lisp/gnus/ChangeLog       2010-02-24 16:40:04 +0000
@@ -1,3 +1,8 @@
+2010-02-24  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * message.el (message-smtpmail-send-it)

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2010-01-13 08:35:10 +0000
+++ b/lisp/gnus/gnus-art.el     2010-02-24 16:40:04 +0000
@@ -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'.