Changes committed gnus/lisp (ChangeLog gnus-art.el)

Modified: ChangeLog gnus-art.el

2010-02-24  Stefan Monnier  <[email protected]>

	* gnus-art.el (gnus-treat-display-x-face): Don't burp if
	shell-command-to-string signals an error (bug#5299).


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.2058 gnus/lisp/ChangeLog:7.2059
--- ChangeLog:7.2058	Wed Feb 24 11:50:30 2010
+++ ChangeLog	Wed Feb 24 23:33:25 2010
@@ -1,3 +1,8 @@
+2010-02-24  Stefan Monnier  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* message.el (message-smtpmail-send-it)
Index: gnus-art.el
diff -u gnus/lisp/gnus-art.el:7.300 gnus/lisp/gnus-art.el:7.301
--- gnus-art.el:7.300	Wed Jan 13 11:59:43 2010
+++ gnus-art.el	Wed Feb 24 23:33:25 2010
@@ -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'.