(shr-get-image-data): Ensure against the cache file missing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f873857..ac500fa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,7 @@
 2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-tag-blockquote): Ensure paragraph after quote, too.
 2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-tag-blockquote): Ensure paragraph after quote, too.

+       (shr-get-image-data): Ensure against the cache file missing.

 
        * nnimap.el (nnimap-finish-retrieve-group-infos): Message while waiting
        for data.
 
        * nnimap.el (nnimap-finish-retrieve-group-infos): Message while waiting
        for data.

diff --git a/lisp/shr.el b/lisp/shr.el
index 5d94bf9..59d7b78 100644 (file)
--- a/lisp/shr.el
+++ b/lisp/shr.el
@@ -346,10 +346,12 @@ redirects somewhere else."
 Return a string with image data."
   (with-temp-buffer
     (mm-disable-multibyte)
 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)
 
 
 (defvar shr-list-mode nil)