Mercurial > emacs
changeset 110137:492438952164
merge trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Thu, 02 Sep 2010 10:09:22 +0900 |
| parents | e7de8c9ba0b3 (current diff) 7181bb530921 (diff) |
| children | 99544439ab8f |
| files | |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Thu Sep 02 10:04:37 2010 +0900 +++ b/lisp/gnus/ChangeLog Thu Sep 02 10:09:22 2010 +0900 @@ -1,5 +1,10 @@ 2010-09-01 Lars Magne Ingebrigtsen <larsi@gnus.org> + * gnus-html.el (gnus-html-wash-tags): "A" is also used for links, just + like "a", it seems like. + (gnus-html-image-url-blocked-p): Take a parameter for blocked-images + since it needs to be picked from the correct buffer. + * nnwfm.el: Removed. * nnlistserv.el: Removed.
--- a/lisp/gnus/gnus-html.el Thu Sep 02 10:04:37 2010 +0900 +++ b/lisp/gnus/gnus-html.el Thu Sep 02 10:09:22 2010 +0900 @@ -136,7 +136,7 @@ (delete-region start end) (gnus-put-image image (gnus-string-or string "*"))))) ;; Normal, external URL. - (unless (gnus-html-image-url-blocked-p url) + (unless (gnus-html-image-url-blocked-p url gnus-blocked-images) (let ((file (gnus-html-image-id url))) (if (file-exists-p file) ;; It's already cached, so just insert it. @@ -151,7 +151,8 @@ (point-marker)) images))))))) ;; Add a link. - ((equal tag "a") + ((or (equal tag "a") + (equal tag "A")) (when (string-match "href=\"\\([^\"]+\\)" parameters) (setq url (match-string 1 parameters)) (gnus-message 8 "Fetching link URL %s" url) @@ -284,10 +285,10 @@ (delete-file (nth 2 file))))))) -(defun gnus-html-image-url-blocked-p (url) +(defun gnus-html-image-url-blocked-p (url blocked-images) "Find out if URL is blocked by `gnus-blocked-images'." - (let ((ret (and gnus-blocked-images - (string-match gnus-blocked-images url)))) + (let ((ret (and blocked-images + (string-match blocked-images url)))) (when ret (gnus-message 8 "Image URL %s is blocked by gnus-blocked-images regex %s" url gnus-blocked-images)) ret)) @@ -301,7 +302,7 @@ (save-match-data (while (re-search-forward "<img.*src=[\"']\\([^\"']+\\)" nil t) (let ((url (match-string 1))) - (unless (gnus-html-image-url-blocked-p url) + (unless (gnus-html-image-url-blocked-p url blocked-images) (unless (file-exists-p (gnus-html-image-id url)) (push url urls) (push (gnus-html-image-id url) urls)