Merge changes made in No Gnus

shr.el: Inhibit getting and sending cookies when fetching pictures.
gnus-html.el (gnus-html-schedule-image-fetching): Ditto.

3 files changed, 15 insertions, 10 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 827ccc730d..d6631ac2ce 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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/gnus-html.el b/lisp/gnus/gnus-html.el
index 5bbb9e10e0..770904fa1c 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/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/gnus/shr.el b/lisp/gnus/shr.el
index 7af8e31f79..386c9c62b6 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/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)