[gnus git] branch no-gnus updated: m0-1-39-g283e76b =1= Inhibit cookies when fetching pictures
Lars Ingebrigtsen <[email protected]>
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via 283e76bd2d5af17da11a4f5da4443962eab7ae53 (commit)
from d62c053a608997ca345400f633bd3e4f1c927f3f (commit)
- Log -----------------------------------------------------------------
commit 283e76bd2d5af17da11a4f5da4443962eab7ae53
Author: Lars Ingebrigtsen <[email protected]>
Date: Wed Feb 8 01:08:51 2012 +0100
Inhibit cookies when fetching pictures
* gnus-html.el (gnus-html-schedule-image-fetching): Ditto.
* shr.el: Inhibit getting and sending cookies when fetching pictures.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 217fde6..8482dc2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-08 Lars Ingebrigtsen <[email protected]>
+
+ * shr.el: Inhibit getting and sending cookies when fetching pictures.
+
+ * gnus-html.el (gnus-html-schedule-image-fetching): Ditto.
+
2012-02-07 Lars Ingebrigtsen <[email protected]>
* shr.el (shr-remove-trailing-whitespace): Don't strip whitespace from
diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 5bbb9e1..770904f 100644
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -390,7 +390,7 @@ Use ALT-TEXT for the image string."
(if (fboundp 'url-queue-retrieve)
(url-queue-retrieve (car image)
'gnus-html-image-fetched
- (list buffer image) t)
+ (list buffer image) t t)
(ignore-errors
(url-retrieve (car image)
'gnus-html-image-fetched
diff --git a/lisp/shr.el b/lisp/shr.el
index 7af8e31..386c9c6 100644
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -188,7 +188,8 @@ redirects somewhere else."
(when (re-search-forward ".utm_.*" nil t)
(replace-match "" t t))
(message "Copied %s" (buffer-string))
- (copy-region-as-kill (point-min) (point-max)))))))
+ (copy-region-as-kill (point-min) (point-max)))))
+ nil t))
;; Copy the URL to the kill ring.
(t
(with-temp-buffer
@@ -231,7 +232,7 @@ the URL of the image to the kill buffer instead."
(message "Inserting %s..." url)
(url-retrieve url 'shr-image-fetched
(list (current-buffer) (1- (point)) (point-marker))
- t))))
+ t t))))
;;; Utility functions.
@@ -510,7 +511,8 @@ the URL of the image to the kill buffer instead."
(if (not url)
(message "No link under point")
(url-retrieve (shr-encode-url url)
- 'shr-store-contents (list url directory)))))
+ 'shr-store-contents (list url directory)
+ nil t))))
(defun shr-store-contents (status url directory)
(unless (plist-get status :error)
@@ -617,7 +619,7 @@ START, and END. Note that START and END should be markers."
(delete-region (point) end))))
(url-retrieve url 'shr-image-fetched
(list (current-buffer) start end)
- t)))))
+ t t)))))
(defun shr-heading (cont &rest types)
(shr-ensure-paragraph)
@@ -927,13 +929,10 @@ ones, in case fg and bg are nil."
(let ((file (url-cache-create-filename (shr-encode-url url))))
(when (file-exists-p file)
(delete-file file))))
- (funcall
- (if (fboundp 'url-queue-retrieve)
- 'url-queue-retrieve
- 'url-retrieve)
+ (url-queue-retrieve
(shr-encode-url url) 'shr-image-fetched
(list (current-buffer) start (set-marker (make-marker) (1- (point))))
- t)))
+ t t)))
(when (zerop shr-table-depth) ;; We are not in a table.
(put-text-property start (point) 'keymap shr-map)
(put-text-property start (point) 'shr-alt alt)
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 6 ++++++
lisp/gnus-html.el | 2 +-
lisp/shr.el | 17 ++++++++---------
3 files changed, 15 insertions(+), 10 deletions(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, no-gnus has been updated
hooks/post-receive
--
Gnus Project