From: yamaoka <yamaoka>
Date: Mon, 30 Jul 2001 13:08:47 +0000 (+0000)
Subject: * gnus-sum.el (gnus-select-newsgroup): Don't examine cached articles with
X-Git-Tag: t-gnus-6_15_4-06-quimby~16
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3de0177d63a2a36a513f6ae804c1cbbf66e67855;p=elisp%2Fgnus.git-

* 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 38b3a8f..31314ec 100644
--- 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 05.
 
 	* lisp/nnmh.el (nnmh-retrieve-parsed-headers): Abolished.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index df1e2cc..a76b6e9 100644
--- 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))
 
@@ -4529,10 +4528,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
@@ -4563,6 +4560,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))
@@ -4579,11 +4580,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))