Mercurial > emacs

diff lisp/gnus/mm-decode.el @ 111634:3334777d733d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Assume that gnus-inhibit-images may be a group parameter. gnus-art.el (gnus-mime-display-single) gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images) mm-decode.el (mm-shr): Assume that gnus-inhibit-images may be a group parameter.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 19 Nov 2010 04:55:16 +0000
parents db20adbc4108
children 265c545c8f48
line wrap: on
line diff
--- a/lisp/gnus/mm-decode.el	Thu Nov 18 19:14:36 2010 -0600
+++ b/lisp/gnus/mm-decode.el	Fri Nov 19 04:55:16 2010 +0000
@@ -1694,18 +1694,19 @@
   ;; Require since we bind its variables.
   (require 'shr)
   (let ((article-buffer (current-buffer))
-	(shr-blocked-images (if (and (boundp 'gnus-summary-buffer)
-				     (buffer-name gnus-summary-buffer))
-				(with-current-buffer gnus-summary-buffer
-				  (gnus-blocked-images))
-			      shr-blocked-images))
 	(shr-content-function (lambda (id)
 				(let ((handle (mm-get-content-id id)))
 				  (when handle
 				    (mm-with-part handle
 				      (buffer-string))))))
-	(shr-inhibit-images gnus-inhibit-images)
-	charset)
+	shr-inhibit-images shr-blocked-images charset)
+    (if (and (boundp 'gnus-summary-buffer)
+	     (buffer-name gnus-summary-buffer))
+	(with-current-buffer gnus-summary-buffer
+	  (setq shr-inhibit-images gnus-inhibit-images
+		shr-blocked-images (gnus-blocked-images)))
+      (setq shr-inhibit-images gnus-inhibit-images
+	    shr-blocked-images (gnus-blocked-images)))
     (unless handle
       (setq handle (mm-dissect-buffer t)))
     (setq charset (mail-content-type-get (mm-handle-type handle) 'charset))