changeset 111083:9a8bf31cd307

gnus-group.el (gnus-group-unsubscribe-group): Fix args passed to gnus-group-completing-read. gnus-start.el (gnus-read-active-file-1): Don't add method to gnus-have-read-active-file if it's already been in.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 22 Oct 2010 01:39:13 +0000
parents 9d01a8aadec3
children 8c55e138333b
files lisp/gnus/ChangeLog lisp/gnus/gnus-group.el lisp/gnus/gnus-start.el
diffstat 3 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Thu Oct 21 22:12:01 2010 +0000
+++ b/lisp/gnus/ChangeLog	Fri Oct 22 01:39:13 2010 +0000
@@ -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
--- a/lisp/gnus/gnus-group.el	Thu Oct 21 22:12:01 2010 +0000
+++ b/lisp/gnus/gnus-group.el	Fri Oct 22 01:39:13 2010 +0000
@@ -3676,7 +3676,7 @@
 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)
--- a/lisp/gnus/gnus-start.el	Thu Oct 21 22:12:01 2010 +0000
+++ b/lisp/gnus/gnus-start.el	Fri Oct 22 01:39:13 2010 +0000
@@ -2090,7 +2090,7 @@
 	  (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)