* elmo.el (elmo-message-fetch-with-cache-process): Call

elmo-message-fetch-internal instead of causing an error when fetch
strategy is 'entire but only 'section cache is available.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index fe4e572..4d79765 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-15  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
+
+       * elmo.el (elmo-message-fetch-with-cache-process): Call
+       elmo-message-fetch-internal instead of causing an error when fetch
+       strategy is 'entire but only 'section cache is available.
+
 2001-08-15  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-version.el (elmo-version): Up to 2.7.2.

diff --git a/elmo/elmo.el b/elmo/elmo.el
index 2543d9d..65b517d 100644 (file)
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -1138,16 +1138,16 @@ FIELD is a symbol of the field."
                                                           number strategy
                                                           &optional
                                                           section unread)
-  (let (cache-file)
+  (let (cache-path cache-file)
     (if (and (elmo-fetch-strategy-use-cache strategy)
+            (setq cache-path (elmo-fetch-strategy-cache-path strategy))
             (setq cache-file (elmo-file-cache-expand-path
-                              (elmo-fetch-strategy-cache-path strategy)
+                              cache-path
                               section))
-            (file-exists-p cache-file))
-       (if (and (elmo-cache-path-section-p cache-file)
-                (eq (elmo-fetch-strategy-entireness strategy) 'entire))
-           (error "Entire message is not cached.")
-         (insert-file-contents-as-binary cache-file))
+            (file-exists-p cache-file)
+            (or (not (elmo-cache-path-section-p cache-file))
+                (not (eq (elmo-fetch-strategy-entireness strategy) 'entire))))
+       (insert-file-contents-as-binary cache-file)
       (elmo-message-fetch-internal folder number strategy section unread)
       (elmo-delete-cr-buffer)
       (when (and (> (buffer-size) 0)