From: yoichi <yoichi>
Date: Tue, 26 Mar 2002 15:13:39 +0000 (+0000)
Subject: * elmo.el (elmo-find-fetch-strategy): Don't use file cache when
X-Git-Tag: elmo-mark-root~230
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6159b742d8234de30e65902daf31ca4ec256bc2e;p=elisp%2Fwanderlust.git

* elmo.el (elmo-find-fetch-strategy): Don't use file cache when
`elmo-message-use-cache-p' returns nil.
* elmo-mime.el (elmo-mime-display-as-is): Ditto.
(ignore cache file and refer the substance in local folders)
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 8e4b0cd..922d967 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-26  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* elmo.el (elmo-find-fetch-strategy): Don't use file cache when
+	`elmo-message-use-cache-p' returns nil.
+	* elmo-mime.el (elmo-mime-display-as-is): Ditto.
+	(ignore cache file and refer the substance in local folders)
+
 2002-03-12  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* elmo-version.el (elmo-version): Up to 2.9.8.
diff --git a/elmo/elmo-mime.el b/elmo/elmo-mime.el
index 46a4881..9efb463 100644
--- a/elmo/elmo-mime.el
+++ b/elmo/elmo-mime.el
@@ -260,7 +260,8 @@ Return non-nil if cache is used."
 	cache-file strategy use-cache)
     (setq cache-file (elmo-file-cache-get
 		      (elmo-msgdb-overview-entity-get-id entity)))
-    (setq use-cache (eq (elmo-file-cache-status cache-file) 'entire))
+    (setq use-cache (and (elmo-message-use-cache-p folder number)
+			 (eq (elmo-file-cache-status cache-file) 'entire)))
     (setq strategy (elmo-make-fetch-strategy
 		    'entire use-cache (elmo-message-use-cache-p folder number)
 		    (elmo-file-cache-path
diff --git a/elmo/elmo.el b/elmo/elmo.el
index b2a437c..7eb82fd 100644
--- a/elmo/elmo.el
+++ b/elmo/elmo.el
@@ -485,6 +485,8 @@ Return newly created temporary directory name which contains temporary files.")
     (setq message-id (elmo-msgdb-overview-entity-get-id entity))
     (setq number (elmo-msgdb-overview-entity-get-number entity))
     (setq cache-file (elmo-file-cache-get message-id))
+    (setq ignore-cache (or ignore-cache
+			   (null (elmo-message-use-cache-p folder number))))
     (if (or ignore-cache
 	    (null (elmo-file-cache-status cache-file)))
 	;; No cache or ignore-cache.