[Emacs-diffs] /srv/bzr/emacs/trunk r107063: gnus-group.el (gnus-group-read-ephemeral-group): Don't add a new address parameter if one already exists (bug#9676).

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107063
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-02-02 11:07:55 +0000
message:
  gnus-group.el (gnus-group-read-ephemeral-group): Don't add a new address 
parameter if one already exists (bug#9676).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-group.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-02 10:38:16 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-02 11:07:55 +0000
@@ -1,5 +1,8 @@
 2012-02-02  Lars Ingebrigtsen  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/gnus/gnus-group.el'
--- a/lisp/gnus/gnus-group.el   2012-02-01 23:16:56 +0000
+++ b/lisp/gnus/gnus-group.el   2012-02-02 11:07:55 +0000
@@ -2295,10 +2295,15 @@
     (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))))