Mercurial > emacs

changeset 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 4e76c4e4f20f
children b8f48ecba2e7
files lisp/gnus/ChangeLog lisp/gnus/gnus-art.el lisp/gnus/gnus-html.el lisp/gnus/mm-decode.el
diffstat 4 files changed, 35 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Thu Nov 18 19:14:36 2010 -0600
+++ b/lisp/gnus/ChangeLog	Fri Nov 19 04:55:16 2010 +0000
@@ -1,3 +1,10 @@
+2010-11-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* 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.
+
 2010-11-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* shr.el (shr-table-horizontal-line): Renamed from shr-table-line.
--- a/lisp/gnus/gnus-art.el	Thu Nov 18 19:14:36 2010 -0600
+++ b/lisp/gnus/gnus-art.el	Fri Nov 19 04:55:16 2010 +0000
@@ -5851,7 +5851,10 @@
 	(while ignored
 	  (when (string-match (pop ignored) type)
 	    (throw 'ignored nil)))
-	(if (and (not (and gnus-inhibit-images
+	(if (and (not (and (if (gnus-buffer-live-p gnus-summary-buffer)
+			       (with-current-buffer gnus-summary-buffer
+				 gnus-inhibit-images)
+			     gnus-inhibit-images)
 			   (string-match "\\`image/" type)))
 		 (setq not-attachment
 		       (and (not (mm-inline-override-p handle))
--- a/lisp/gnus/gnus-html.el	Thu Nov 18 19:14:36 2010 -0600
+++ b/lisp/gnus/gnus-html.el	Fri Nov 19 04:55:16 2010 +0000
@@ -169,7 +169,14 @@
 
 (defun gnus-html-wash-images ()
   "Run through current buffer and replace img tags by images."
-  (let (tag parameters string start end images url alt-text)
+  (let (tag parameters string start end images url alt-text
+	    inhibit-images blocked-images)
+    (if (buffer-live-p gnus-summary-buffer)
+	(with-current-buffer gnus-summary-buffer
+	  (setq inhibit-images gnus-inhibit-images
+		blocked-images (gnus-blocked-images)))
+      (setq inhibit-images gnus-inhibit-images
+	    blocked-images (gnus-blocked-images)))
     (goto-char (point-min))
     ;; Search for all the images first.
     (while (re-search-forward "<img_alt \\([^>]*\\)>" nil t)
@@ -200,7 +207,7 @@
 	    ;; immediately.
 	    (let* ((handle (mm-get-content-id (substring url (match-end 0))))
 		   (image (when (and handle
-				     (not gnus-inhibit-images))
+				     (not inhibit-images))
 			    (gnus-create-image
 			     (mm-with-part handle (buffer-string))
 			     nil t))))
@@ -222,13 +229,8 @@
 		 :keymap gnus-html-image-map
 		 :button-keymap gnus-html-image-map)))
 	  ;; Normal, external URL.
-	  (if (or gnus-inhibit-images
-		  (gnus-html-image-url-blocked-p
-		   url
-		   (if (buffer-live-p gnus-summary-buffer)
-		       (with-current-buffer gnus-summary-buffer
-			 (gnus-blocked-images))
-		     (gnus-blocked-images))))
+	  (if (or inhibit-images
+		  (gnus-html-image-url-blocked-p url blocked-images))
 	      (widget-convert-button
 	       'link start end
 	       :action 'gnus-html-insert-image
@@ -505,13 +507,15 @@
 ;;;###autoload
 (defun gnus-html-prefetch-images (summary)
   (when (buffer-live-p summary)
-    (let ((blocked-images (with-current-buffer summary
-                            (gnus-blocked-images))))
+    (let (inhibit-images blocked-images)
+      (with-current-buffer summary-buffer
+	(setq inhibit-images gnus-inhibit-images
+	      blocked-images (gnus-blocked-images)))
       (save-match-data
 	(while (re-search-forward "<img[^>]+src=[\"']\\(http[^\"']+\\)" nil t)
 	  (let ((url (gnus-html-encode-url
 		      (mm-url-decode-entities-string (match-string 1)))))
-	    (unless (or gnus-inhibit-images
+	    (unless (or inhibit-images
 			(gnus-html-image-url-blocked-p url blocked-images))
               (when (gnus-html-cache-expired url gnus-html-image-cache-ttl)
                 (gnus-html-schedule-image-fetching nil
--- 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))