Update with-url branch and rename to with-fetched-urlwith-fetched-url

1 files changed, 7 insertions, 13 deletions

diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index f097028cb3e..eefeabe2fa1 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -372,20 +372,14 @@ Use ALT-TEXT for the image string."
 		      'gnus-html-image-fetched
 		      (list buffer image) t t))
 
-(defun gnus-html-image-fetched (status buffer image)
+(defun gnus-html-image-fetched (buffer image)
   "Callback function called when image has been fetched."
-  (unless (plist-get status :error)
-    (when (and (or (search-forward "\n\n" nil t)
-                   (search-forward "\r\n\r\n" nil t))
-	       (not (eobp)))
-      (when gnus-html-image-automatic-caching
-	(url-store-in-cache (current-buffer)))
-      (when (buffer-live-p buffer)
-	(let ((data (buffer-substring (point) (point-max))))
-	  (with-current-buffer buffer
-	    (let ((inhibit-read-only t))
-	      (gnus-html-put-image data (car image) (cadr image))))))))
-  (kill-buffer (current-buffer)))
+  (unless (url-errorp)
+    (when (buffer-live-p buffer)
+      (let ((data (buffer-substring (point) (point-max))))
+	(with-current-buffer buffer
+	  (let ((inhibit-read-only t))
+	    (gnus-html-put-image data (car image) (cadr image))))))))
 
 (defun gnus-html-get-image-data (url)
   "Get image data for URL.