- (when (string-match "src=\"\\([^\"]+\\)" parameters)
- (setq parameters (match-string 1 parameters))
- (when (or (null mm-w3m-safe-url-regexp)
- (string-match mm-w3m-safe-url-regexp parameters))
- (let ((file (gnus-html-image-id parameters)))
- (if (file-exists-p file)
- ;; It's already cached, so just insert it.
- (when (gnus-html-put-image file (point))
- ;; Delete the ALT text.
- (delete-region start end))
- ;; We don't have it, so schedule it for fetching
- ;; asynchronously.
- (push (list parameters
- (set-marker (make-marker) start)
- (point-marker))
- images))))))
+ (when (string-match "src=\"\\([^\"]+\\)" parameters)
+ (setq url (match-string 1 parameters))
+ (gnus-message 8 "gnus-html-wash-tags: fetching image URL %s" url)
+ (if (string-match "^cid:\\(.*\\)" url)
+ ;; URLs with cid: have their content stashed in other
+ ;; parts of the MIME structure, so just insert them
+ ;; immediately.
+ (let ((handle (mm-get-content-id
+ (setq url (match-string 1 url))))
+ image)
+ (when handle
+ (mm-with-part handle
+ (setq image (gnus-create-image (buffer-string)
+ nil t))))
+ (when image
+ (let ((string (buffer-substring start end)))
+ (delete-region start end)
+ (gnus-put-image image (gnus-string-or string "*")))))
+ ;; Normal, external URL.
+ (unless (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))
+ (let ((file (gnus-html-image-id url))
+ width height)
+ (when (string-match "height=\"?\\([0-9]+\\)" parameters)
+ (setq height (string-to-number (match-string 1 parameters))))
+ (when (string-match "width=\"?\\([0-9]+\\)" parameters)
+ (setq width (string-to-number (match-string 1 parameters))))
+ ;; Don't fetch images that are really small. They're
+ ;; probably tracking pictures.
+ (when (and (or (null height)
+ (> height 4))
+ (or (null width)
+ (> width 4)))
+ (if (file-exists-p file)
+ ;; It's already cached, so just insert it.
+ (let ((string (buffer-substring start end)))
+ ;; Delete the ALT text.
+ (delete-region start end)
+ (gnus-html-put-image file (point) string))
+ ;; We don't have it, so schedule it for fetching
+ ;; asynchronously.
+ (push (list url
+ (set-marker (make-marker) start)
+ (point-marker))
+ images))))))))