[gnus git] branch no-gnus updated: m0-1-42-g61456c2 =1= More fixes to not list ephemeral servers in the server buffer

       via  61456c27cf74976b65c666bac3295d61b8adf1ae (commit)
      from  9da41c0a12aceb9c57f581cd28f575ccb9ea6d4c (commit)


- Log -----------------------------------------------------------------
commit 61456c27cf74976b65c666bac3295d61b8adf1ae
Author: Lars Ingebrigtsen <[email protected]>
Date:   Thu Feb 9 02:04:59 2012 +0100

    More fixes to not list ephemeral servers in the server buffer
    
    * gnus.el (gnus-server-extend-method): Don't add an -address component
    if the method already has one (bug#9676).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd8943d..145d16e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-09  Lars Ingebrigtsen  <[email protected]>
+
+	* gnus.el (gnus-server-extend-method): Don't add an -address component
+	if the method already has one (bug#9676).
+
 2012-02-08  Lars Ingebrigtsen  <[email protected]>
 
 	* gnus-sum.el (gnus-summary-insert-old-articles): Use a default instead
diff --git a/lisp/gnus.el b/lisp/gnus.el
index de4a5f9..8afb53b 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -4122,12 +4122,17 @@ parameters."
   (if (or (not (inline (gnus-similar-server-opened method)))
 	  (not (cddr method)))
       method
+    (let ((address-slot
+	   (intern (format "%s-address" (car method)))))
     (setq method
+	    (if (assq address-slot (cddr method))
 	  `(,(car method) ,(concat (cadr method) "+" group)
-	    (,(intern (format "%s-address" (car method))) ,(cadr method))
-	    ,@(cddr method)))
+		  ,@(cddr method))
+	      `(,(car method) ,(concat (cadr method) "+" group)
+		(,address-slot ,(cadr method))
+		,@(cddr method))))
     (push method gnus-extended-servers)
-    method))
+      method)))
 
 (defun gnus-server-status (method)
   "Return the status of 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 |    5 +++++
 lisp/gnus.el   |   17 +++++++++++------
 2 files changed, 16 insertions(+), 6 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