gnus-html.el (gnus-html-schedule-image-fetching): Fix last change.

[gnus] / lisp / shr.el

diff --git a/lisp/shr.el b/lisp/shr.el
index ca7d8bf..59d7b78 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -292,7 +292,8 @@ redirects somewhere else."
 (defun shr-tag-blockquote (cont)
   (shr-ensure-paragraph)
   (let ((shr-indentation (+ shr-indentation 4)))
-    (shr-generic cont)))
+    (shr-generic cont))
+  (shr-ensure-paragraph))
 
 (defun shr-ensure-newline ()
   (unless (zerop (current-column))
@@ -345,10 +346,12 @@ redirects somewhere else."
 Return a string with image data."
   (with-temp-buffer
     (mm-disable-multibyte)
-    (url-cache-extract (url-cache-create-filename url))
-    (when (or (search-forward "\n\n" nil t)
-              (search-forward "\r\n\r\n" nil t))
-      (buffer-substring (point) (point-max)))))
+    (when (ignore-errors
+           (url-cache-extract (url-cache-create-filename url))
+           t)
+      (when (or (search-forward "\n\n" nil t)
+               (search-forward "\r\n\r\n" nil t))
+       (buffer-substring (point) (point-max))))))
 
 (defvar shr-list-mode nil)