[Emacs-diffs] /srv/bzr/emacs/trunk r107189: gnus.el: More fixes to not list ephemeral servers in the server buffer

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 107189
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-02-09 01:12:44 +0000
message:
  gnus.el: More fixes to not list ephemeral servers in the server buffer
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-02-09 01:08:34 +0000
+++ b/lisp/gnus/ChangeLog       2012-02-09 01:12:44 +0000
@@ -1,3 +1,8 @@
+2012-02-09  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-sum.el (gnus-summary-insert-old-articles): Use a default instead

=== modified file 'lisp/gnus/gnus.el'
--- a/lisp/gnus/gnus.el 2012-02-01 23:22:55 +0000
+++ b/lisp/gnus/gnus.el 2012-02-09 01:12:44 +0000
@@ -4123,12 +4123,17 @@
   (if (or (not (inline (gnus-similar-server-opened method)))
          (not (cddr method)))
       method
-    (setq method
-         `(,(car method) ,(concat (cadr method) "+" group)
-           (,(intern (format "%s-address" (car method))) ,(cadr method))
-           ,@(cddr method)))
-    (push method gnus-extended-servers)
-    method))
+    (let ((address-slot
+          (intern (format "%s-address" (car method)))))
+      (setq method
+           (if (assq address-slot (cddr method))
+               `(,(car method) ,(concat (cadr method) "+" group)
+                 ,@(cddr method))
+             `(,(car method) ,(concat (cadr method) "+" group)
+               (,address-slot ,(cadr method))
+               ,@(cddr method))))
+      (push method gnus-extended-servers)
+      method)))
 
 (defun gnus-server-status (method)
   "Return the status of METHOD."