Commit 2333c84a authored by Kenichi Handa's avatar Kenichi Handa
Browse files

merge trunk

......@@ -159,5 +159,4 @@ seen in the same session."
(provide 'gnus-dup)
;; arch-tag: 903e94db-7b00-4d19-83ee-cf34a81fa5fb
;;; gnus-dup.el ends here
......@@ -130,5 +130,4 @@ The optional LAYOUT overrides the `edit-form' window layout."
(provide 'gnus-eform)
;; arch-tag: ef50678c-2c28-49ef-affc-e53b3b2c0bf6
;;; gnus-eform.el ends here
......@@ -341,5 +341,4 @@ It can be retrieved with `(gnus-process-get PROCESS PROPNAME)'."
(provide 'gnus-ems)
;; arch-tag: e7360b45-14b5-4171-aa39-69a44aed3cdb
;;; gnus-ems.el ends here
......@@ -290,5 +290,4 @@ colors of the displayed X-Faces."
(provide 'gnus-fun)
;; arch-tag: 9d000a69-15cc-4491-9dc0-4627484f50c1
;;; gnus-fun.el ends here
......@@ -4717,5 +4717,4 @@ Compacting group %s... (this may take a long time)"
(provide 'gnus-group)
;; arch-tag: 2eb5440f-0bca-4091-814c-e37817536af6
;;; gnus-group.el ends here
......@@ -136,7 +136,7 @@ fit these criteria."
(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 @@ fit these criteria."
(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 @@ fit these criteria."
(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 @@ fit these criteria."
(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)
......
......@@ -716,5 +716,4 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
(provide 'gnus-int)
;; arch-tag: bbc90087-9b7f-4017-a92c-3abf180ac86d
;;; gnus-int.el ends here
......@@ -715,5 +715,4 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score"
(provide 'gnus-kill)
;; arch-tag: b30c0f53-df1a-490b-b81e-17b13474f395
;;; gnus-kill.el ends here
......@@ -225,5 +225,4 @@
(provide 'gnus-logic)
;; arch-tag: 9651a100-4a59-4b69-a55b-e511e67c0f8d
;;; gnus-logic.el ends here
......@@ -109,5 +109,4 @@ Otherwise, it is like +news/group."
(provide 'gnus-mh)
;; arch-tag: 2d5696d3-b363-48e5-8749-c256be56acca
;;; gnus-mh.el ends here
......@@ -180,5 +180,4 @@ ADDRESS is specified by a \"mailto:\" URL."
(provide 'gnus-ml)
;; arch-tag: 936c0fe6-acce-4c16-87d0-eded88078896
;;; gnus-ml.el ends here
......@@ -227,5 +227,4 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
(provide 'gnus-mlspl)
;; arch-tag: 62b3381f-1e45-4b61-be1a-29fb27703322
;;; gnus-mlspl.el ends here
......@@ -1989,5 +1989,4 @@ this is a reply."
(provide 'gnus-msg)
;; arch-tag: 9f22b2f5-1c0a-49de-916e-4c88e984852b
;;; gnus-msg.el ends here
......@@ -449,5 +449,4 @@ valid issuer, which is much faster if you are selective about the issuers."
(provide 'gnus-nocem)
;; arch-tag: 0e0c74ea-2f8e-4f3e-8fff-09f767c1adef
;;; gnus-nocem.el ends here
......@@ -319,5 +319,4 @@ If picons are already displayed, remove them."
(provide 'gnus-picon)
;; arch-tag: fe9aede0-1b1b-463a-b4ab-807f98bcb31f
;;; gnus-picon.el ends here
......@@ -654,5 +654,4 @@ LIST is a sorted list."
(provide 'gnus-range)
;; arch-tag: 4780bdd8-5a15-4aff-be28-18727895b6ad
;;; gnus-range.el ends here
......@@ -1183,5 +1183,4 @@ Returns the first place where the trail finds a group name."
(provide 'gnus-registry)
;; arch-tag: 5cba0a32-718a-4a97-8c91-0a15af21da94
;;; gnus-registry.el ends here
......@@ -1045,5 +1045,4 @@ The following commands are available:
(provide 'gnus-salt)
;; arch-tag: 35449164-77b3-4398-bcbd-a2e3e998f810
;;; gnus-salt.el ends here
......@@ -3122,5 +3122,4 @@ See Info node `(gnus)Scoring Tips' for examples of good regular expressions."
(provide 'gnus-score)
;; arch-tag: d3922589-764d-46ae-9954-9330fd192634
;;; gnus-score.el ends here
......@@ -189,5 +189,4 @@ score the alt hierarchy, you'd say \"!alt.all\"." t nil))
(run-hooks 'gnus-setup-load-hook)
;; arch-tag: 08e4af93-8565-46bf-905c-36229400609d
;;; gnus-setup.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment