2001-08-04 Simon Josefsson <jas@extundo.com>

	* gnus-cache.el (gnus-cache-possibly-enter-article): Revert.
	(gnus-cache-passively-or-fully-p): Removed.
	(gnus-cache-fully-p): Fix it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68147c7..8d17060 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-04  Simon Josefsson  <jas@extundo.com>
 
+       * gnus-cache.el (gnus-cache-possibly-enter-article): Revert.
+       (gnus-cache-passively-or-fully-p): Removed.
+       (gnus-cache-fully-p): Fix it.
+
        * mm-view.el (mm-pkcs7-signed-magic): Support more ASN.1 lengths.
 
 2001-08-04  Simon Josefsson  <jas@extundo.com>

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 0c76e55..1a47847 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -160,7 +160,11 @@ it's not cached."
       (when (and number
                 (> number 0)           ; Reffed article.
                 (or force
-                    (and (gnus-cache-passively-or-fully-p group)
+                    (and (or (not gnus-cacheable-groups)
+                             (string-match gnus-cacheable-groups group))
+                         (or (not gnus-uncacheable-groups)
+                             (not (string-match
+                                   gnus-uncacheable-groups group)))
                          (gnus-cache-member-of-class
                           gnus-cache-enter-articles ticked dormant unread)))
                 (not (file-exists-p (setq file (gnus-cache-file-name
@@ -692,24 +696,19 @@ If LOW, update the lower bound instead."
   (interactive "FMove the cache tree to: ")
   (rename-file gnus-cache-directory dir))
 
-(defun gnus-cache-passively-or-fully-p (&optional group)
-  "Returns non-nil if the cache should be used, possibly just passively.
+(defun gnus-cache-fully-p (&optional group)
+  "Returns non-nil if the cache should be fully used.
 If GROUP is non-nil, also cater to `gnus-cacheable-groups' and
 `gnus-uncacheable-groups'."
   (and gnus-use-cache
+       (not (eq gnus-use-cache 'passive))
        (if (null group)
           t
         (and (or (not gnus-cacheable-groups)
                  (string-match gnus-cacheable-groups group))
              (or (not gnus-uncacheable-groups)
                  (not (string-match gnus-uncacheable-groups group)))))))
-
-(defun gnus-cache-fully-p (&optional group)
-  "Returns non-nil if the cache should be fully used.
-If GROUP is non-nil, also cater to `gnus-cacheable-groups' and
-`gnus-uncacheable-groups'."
-  (and (gnus-cache-passively-or-fully-p group)
-       (not (eq gnus-use-cache 'passive))))
+       
 
 (provide 'gnus-cache)