gnus-start.el (gnus-make-hashtable-from-newsrc-alist): Remove duplicates from .newsrc...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5f692d626cf89fcda72d9489e956d463b72f27ec..9ed24b72a55763dc4a50d6dcbbd6d4afb841fa86 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2,6 +2,8 @@
 
        * gnus-start.el (gnus-get-unread-articles): Protect against groups that
        come from no known methods.
+       (gnus-make-hashtable-from-newsrc-alist): Remove duplicates from .newsrc
+       list.
 
        * pop3.el (pop3-display-message-size-flag): Removed -- everybody wants
        message sizes.

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index c7d85524ef0f857dda4f03b3641ce3d481c04984..0e35a12cf7d0a0944445cd08b834f38d8979334e 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1815,14 +1815,18 @@ If SCAN, request a scan of that group as well."
        (if (setq rest (member method methods))
            (gnus-info-set-method info (car rest))
          (push method methods)))
-      (gnus-sethash
-       (car info)
-       ;; Preserve number of unread articles in groups.
-       (cons (and ohashtb (car (gnus-gethash (car info) ohashtb)))
-            prev)
-       gnus-newsrc-hashtb)
-      (setq prev alist
-           alist (cdr alist)))
+      ;; Check for duplicates.
+      (if (gnus-gethash (car info) gnus-newsrc-hashtb)
+         ;; Remove this entry from the alist.
+         (setcdr prev (cddr prev))
+       (gnus-sethash
+        (car info)
+        ;; Preserve number of unread articles in groups.
+        (cons (and ohashtb (car (gnus-gethash (car info) ohashtb)))
+              prev)
+        gnus-newsrc-hashtb)
+       (setq prev alist))
+      (setq alist (cdr alist)))
     ;; Make the same select-methods in `gnus-server-alist' identical
     ;; as well.
     (while methods