2001-05-04 00:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* nnrss.el (nnrss-request-expire-articles): Correct the return value.

	* nnslashdot.el (nnslashdot-request-list): Add time.
	(nnslashdot-request-expire-articles): New.

	* gnus-start.el (gnus-check-bogus-newsgroups): Remove bogus
	secondary methods too.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4e00be..1ec2701 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2001-05-04 00:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnrss.el (nnrss-request-expire-articles): Correct the return value.
+
+       * nnslashdot.el (nnslashdot-request-list): Add time.
+       (nnslashdot-request-expire-articles): New.
+
+       * gnus-start.el (gnus-check-bogus-newsgroups): Remove bogus
+       secondary methods too.
+
 2001-05-03 23:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-use-followup-to): Set default value to t.

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 22e0096..19cffb8 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1359,7 +1359,9 @@ newsgroup."
        (setq info (pop newsrc)
              group (gnus-info-group info))
        (unless (or (gnus-active group) ; Active
-                   (gnus-info-method info)) ; Foreign
+                   (and (gnus-info-method info)
+                        (not (gnus-secondary-method-p 
+                              (gnus-info-method info))))) ; Foreign
          ;; Found a bogus newsgroup.
          (push group bogus)))
       (if confirm

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index fbb760c..eca89da 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -191,7 +191,7 @@
 (deffoo nnrss-request-expire-articles
     (articles group &optional server force)
   (nnrss-possibly-change-group group server)
-  (let (e changed days)
+  (let (e days expirable)
     (dolist (art articles)
       (when (setq e (assq art nnrss-group-data))
       (if (nnmail-expired-article-p
@@ -199,10 +199,11 @@
           (if (listp (setq days (nth 1 e))) days 
             (days-to-time (- days (time-to-days '(0 0)))))
           force)
-         (setq nnrss-group-data (delq e nnrss-group-data)
-               changed t))))
-    (if changed
-       (nnrss-save-group-data group server))))
+         (push art expirable)
+         (setq nnrss-group-data (delq e nnrss-group-data)))))
+    (if expirable
+       (nnrss-save-group-data group server))
+    expirable))
 
 (deffoo nnrss-request-delete-group (group &optional force server)
   (nnrss-possibly-change-group group server)

diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 6286c86..d761d04 100644 (file)
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -407,7 +407,8 @@
              (setq gname (concat description " (" sid ")"))
              (if (setq elem (assoc gname nnslashdot-groups))
                  (setcar (cdr elem) articles)
-               (push (list gname articles sid) nnslashdot-groups))
+               (push (list gname articles sid (current-time)) 
+                     nnslashdot-groups))
              (goto-char (point-max))
              (widen)))
          ;; Then do the older groups.
@@ -428,7 +429,8 @@
                  (setq gname (concat description " (" sid ")"))
                  (if (setq elem (assoc gname nnslashdot-groups))
                      (setcar (cdr elem) articles)
-                   (push (list gname articles sid) nnslashdot-groups)))))
+                   (push (list gname articles sid (current-time)) 
+                         nnslashdot-groups)))))
            (incf number 30)))
       (search-failed (nnslashdot-lose why)))
     (nnslashdot-write-groups)
@@ -499,6 +501,24 @@
   (setq nnslashdot-headers nil
        nnslashdot-groups nil))
 
+(deffoo nnslashdot-request-expire-articles
+    (articles group &optional server force)
+  (nnslashdot-possibly-change-server group server)
+  (let ((item (assoc group nnslashdot-groups)) expirable)
+    (when item
+      (if (fourth item)
+         (when (and (>= (length articles) (cadr item)) ;; All are expirable.
+                    (nnmail-expired-article-p 
+                     group
+                     (fourth item) 
+                     force))
+           (setq nnslashdot-groups (delq item nnslashdot-groups))
+           (nnslashdot-write-groups)
+           (setq expirable articles))
+       (setcdr (cddr item) (list (current-time)))
+       (nnslashdot-write-groups)))
+    expirable))
+
 (nnoo-define-skeleton nnslashdot)
 
 ;;; Internal functions