2001-08-05 Nuutti Kotivuori <nuutti.kotivuori@smarttrust.com>

	Committed by Simon Josefson <simon@josefsson.org>

	* gnus-cache.el (gnus-cache-possibly-enter-article): Use
	gnus-cache-fully-p.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79edecc..d2f438c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-05  Nuutti Kotivuori  <nuutti.kotivuori@smarttrust.com>
+
+       * gnus-cache.el (gnus-cache-possibly-enter-article): Use
+       gnus-cache-fully-p.
+
 2001-08-04  Simon Josefsson  <jas@extundo.com>
 
        * gnus-cache.el (gnus-cache-possibly-update-active): Create active

diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el
index 4150858..9a603fc 100644 (file)
--- a/lisp/gnus-cache.el
+++ b/lisp/gnus-cache.el
@@ -160,11 +160,7 @@ it's not cached."
       (when (and number
                 (> number 0)           ; Reffed article.
                 (or force
-                    (and (or (not gnus-cacheable-groups)
-                             (string-match gnus-cacheable-groups group))
-                         (or (not gnus-uncacheable-groups)
-                             (not (string-match
-                                   gnus-uncacheable-groups group)))
+                    (and (gnus-cache-fully-p group)
                          (gnus-cache-member-of-class
                           gnus-cache-enter-articles ticked dormant unread)))
                 (not (file-exists-p (setq file (gnus-cache-file-name