gnus-group.el (gnus-group-unsubscribe-group): Fix args passed to gnus-group-completin...

gnus-start.el (gnus-read-active-file-1): Don't add method to gnus-have-read-active-file if it's already been in.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0e41b71b2ce22542f6ef482fedbb1adb42c00080..e6decde4b6fe7ab85a54056a859f7c08fb7a9ca7 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-start.el (gnus-read-active-file-1): Don't add method to
+       gnus-have-read-active-file if it's already been in.
+
+2010-10-22  Tom Tromey  <tromey@redhat.com>
+
+       * gnus-group.el (gnus-group-unsubscribe-group): Fix args passed to
+       gnus-group-completing-read.
+
 2010-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-mode-map): Don't bind M-; to comment region, to

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 6cd8f75d94cd508a0a701feb9254b93ab54de1d5..7152c18d1455956ae681e2df0942bfa8ebbfcde6 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3676,7 +3676,7 @@ If given numerical prefix, toggle the N next groups."
 Killed newsgroups are subscribed.  If SILENT, don't try to update the
 group line."
   (interactive (list (gnus-group-completing-read
-                     nil (gnus-read-active-file-p))))
+                     nil nil (gnus-read-active-file-p))))
   (let ((newsrc (gnus-group-entry group)))
     (cond
      ((string-match "^[ \t]*$" group)

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 26da22e478a5f6fc4cc53222306f7c27237ee66d..dafcd6427271303933118a274e7f212ddba76dc4 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2090,7 +2090,7 @@ If SCAN, request a scan of that group as well."
          (gnus-message 5 "%s" mesg)
          (gnus-active-to-gnus-format method gnus-active-hashtb nil t)
          ;; We mark this active file as read.
-         (push method gnus-have-read-active-file)
+         (add-to-list 'gnus-have-read-active-file method)
          (gnus-message 5 "%sdone" mesg)))))))
 
 (defun gnus-read-active-file-2 (groups method)