[gnus git] branch no-gnus updated: m0-1-19-g46f5b0a =1= Don't list ephemeral groups in the server buffer

       via  46f5b0a42aa14e7fc20a8080dcd25da2d5d891ef (commit)
      from  934635c6adabee85fe22f31c8b67e5f560f41f55 (commit)


- Log -----------------------------------------------------------------
commit 46f5b0a42aa14e7fc20a8080dcd25da2d5d891ef
Author: Lars Ingebrigtsen <[email protected]>
Date:   Thu Feb 2 11:48:29 2012 +0100

    Don't list ephemeral groups in the server buffer
    
    * gnus-group.el (gnus-group-read-ephemeral-group): Don't add a new
    address parameter if one already exists (bug#9676).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85b1db5..405d72e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-02  Lars Ingebrigtsen  <[email protected]>
 
+	* 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 de97d9a..5165e9c 100644
--- 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)))
+  (let ((address-slot
+	 (intern (format "%s-address" (car method)))))
   (setq method
+	  (if (assq address-slot (cddr method))
 	`(,(car method) ,(concat (cadr method) "-ephemeral")
-	  (,(intern (format "%s-address" (car method))) ,(cadr method))
-	  ,@(cddr method)))
+		,@(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))))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog     |    3 +++
 lisp/gnus-group.el |   13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, no-gnus has been updated


hooks/post-receive
-- 
Gnus Project