comparison lisp/gnus/gnus-html.el @ 111067:e36c65ac23bf

Merge changes made in Gnus trunk. nnimap.el (nnimap-insert-partial-structure): Fix boundary detection. spam.el (spam-list-of-processors): Mark as obsolete. gnus-art.el (gnus-blocked-images): New function. Allow the `gnus-blocked-images' to be a function. gnus-art.el (gnus-article-wash-function): Remove it, and use `mm-text-html-renderer' instead. mm-decode.el (mm-inline-text-html-renderer): Removed. mm-decode.el (mm-inline-media-tests): Removed use. mm-view.el (mm-inline-text-html): Removed use. mm-view.el (mm-text-html-renderer-alist): Add the `shr' and `gnus-w3m' symbols. gnus.texi (Article Washing): shr and gnus-w3m, not the direct function names. gnus-art.el (article-wash-html): Simplify and remove the charset stuff. Use the normal html rendering code instead of the special html washing code. mm-view.el (mm-text-html-washer-alist): Removed. gnus-news.texi: Mention that mm-text-html-renderer is the only HTML variable now. shr.el (shr-tag-table): Remove useless nconc.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 20 Oct 2010 22:29:38 +0000
parents 751b2ae689b5
children b4556938af92
comparison
equal deleted inserted replaced
111066:ea124ffc596b 111067:e36c65ac23bf
203 (gnus-put-text-property start end 'gnus-image-url url) 203 (gnus-put-text-property start end 'gnus-image-url url)
204 (if (gnus-html-image-url-blocked-p 204 (if (gnus-html-image-url-blocked-p
205 url 205 url
206 (if (buffer-live-p gnus-summary-buffer) 206 (if (buffer-live-p gnus-summary-buffer)
207 (with-current-buffer gnus-summary-buffer 207 (with-current-buffer gnus-summary-buffer
208 gnus-blocked-images) 208 (gnus-blocked-images))
209 gnus-blocked-images)) 209 (gnus-blocked-images)))
210 (progn 210 (progn
211 (widget-convert-button 211 (widget-convert-button
212 'link start end 212 'link start end
213 :action 'gnus-html-insert-image 213 :action 'gnus-html-insert-image
214 :help-echo url 214 :help-echo url
489 489
490 ;;;###autoload 490 ;;;###autoload
491 (defun gnus-html-prefetch-images (summary) 491 (defun gnus-html-prefetch-images (summary)
492 (when (buffer-live-p summary) 492 (when (buffer-live-p summary)
493 (let ((blocked-images (with-current-buffer summary 493 (let ((blocked-images (with-current-buffer summary
494 gnus-blocked-images))) 494 (gnus-blocked-images))))
495 (save-match-data 495 (save-match-data
496 (while (re-search-forward "<img[^>]+src=[\"']\\([^\"']+\\)" nil t) 496 (while (re-search-forward "<img[^>]+src=[\"']\\([^\"']+\\)" nil t)
497 (let ((url (gnus-html-encode-url (match-string 1)))) 497 (let ((url (gnus-html-encode-url (match-string 1))))
498 (unless (gnus-html-image-url-blocked-p url blocked-images) 498 (unless (gnus-html-image-url-blocked-p url blocked-images)
499 (when (gnus-html-cache-expired url gnus-html-image-cache-ttl) 499 (when (gnus-html-cache-expired url gnus-html-image-cache-ttl)