* gnus-sum.el (gnus-select-newsgroup): Don't examine cached articles with

 `gnus-cache-articles-in-group' even if the current group is not a virtual
 group (see ChangeLog.1 1999-03-02).

diff --git a/ChangeLog b/ChangeLog
index 7f9602c..5aef4e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * lisp/gnus-sum.el (gnus-select-newsgroup): Don't examine cached
+       articles with `gnus-cache-articles-in-group' even if the current
+       group is not a virtual group (see ChangeLog.1 1999-03-02).
+
+2001-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * lisp/gnus-vers.el (gnus-revision-number): Increment to 04.
 
        * lisp/nnmh.el (nnmh-retrieve-parsed-headers): Abolished.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index e470d0e..b1648ad 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -48,7 +48,6 @@
   (require 'static))
 
 (eval-and-compile
-  (autoload 'gnus-cache-articles-in-group "gnus-cache")
   (autoload 'pgg-decrypt-region "pgg" nil t)
   (autoload 'pgg-verify-region "pgg" nil t))
 
@@ -4447,10 +4446,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       (gnus-adjust-marked-articles info))
 
     ;; Kludge to avoid having cached articles nixed out in virtual groups.
-    (setq cached
-         (if (gnus-virtual-group-p group)
-             gnus-newsgroup-cached
-           (gnus-cache-articles-in-group group)))
+    (when (gnus-virtual-group-p group)
+      (setq cached gnus-newsgroup-cached))
 
     (setq gnus-newsgroup-unreads
          (gnus-set-difference
@@ -4481,6 +4478,10 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       ;; Retrieve the headers and read them in.
       (setq gnus-newsgroup-headers (gnus-fetch-headers articles))
 
+      ;; Kludge to avoid having cached articles nixed out in virtual groups.
+      (when cached
+       (setq gnus-newsgroup-cached cached))
+
       ;; Suppress duplicates?
       (when gnus-suppress-duplicates
        (gnus-dup-suppress-articles))
@@ -4497,11 +4498,6 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       ;; Removed marked articles that do not exist.
       (gnus-update-missing-marks
        (gnus-sorted-complement fetched-articles articles))
-
-      ;; Kludge to avoid having cached articles nixed out in virtual groups.
-      (when cached
-       (setq gnus-newsgroup-cached cached))
-
       ;; We might want to build some more threads first.
       (when (and gnus-fetch-old-headers
                 (eq gnus-headers-retrieved-by 'nov))