Merge remote-tracking branch 'origin/no-gnus'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49eea02..80ec54f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -84,6 +84,9 @@
 
 2012-02-02  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-group.el (gnus-group-read-ephemeral-group): Don't add a new
+       address parameter if one already exists (bug#9676).
+
        * gnus-msg.el (gnus-summary-mail-forward): Respect the process marks,
        not the prefix, as documented (bug#10689).
 

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 16fe90c..f75ef37 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2295,10 +2295,15 @@ Return the name of the group if selection was successful."
     (gnus-no-server))
   (when (stringp method)
     (setq method (gnus-server-to-method method)))
-  (setq method
-       `(,(car method) ,(concat (cadr method) "-ephemeral")
-         (,(intern (format "%s-address" (car method))) ,(cadr method))
-         ,@(cddr method)))
+  (let ((address-slot
+        (intern (format "%s-address" (car method)))))
+    (setq method
+         (if (assq address-slot (cddr method))
+             `(,(car method) ,(concat (cadr method) "-ephemeral")
+               ,@(cddr method))
+           `(,(car method) ,(concat (cadr method) "-ephemeral")
+             (,address-slot ,(cadr method))
+             ,@(cddr method)))))
   (let ((group (if (gnus-group-foreign-p group) group
                 (gnus-group-prefixed-name (gnus-group-real-name group)
                                           method))))