Mercurial > emacs
diff lisp/gnus/gnus-html.el @ 111634:3334777d733d
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 | c17f914efec2 |
children | b8f48ecba2e7 |
line wrap: on
line diff
--- 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