Add a kludge to use the given method as in the group name if we're using an extended...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ebc324..31a3828 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-21  Lars Ingebrigtsen  <larsi@gnus.org>
 
+       * nntp.el (nntp-finish-retrieve-group-infos): Add a kludge to use the
+       given method as in the group name if we're using an extended method.
+
        * gnus-start.el (gnus-get-unread-articles): Extend the methods so that
        we're sure to get unique server names, and we don't output two async
        commands in the same buffer.  This fixes an NNTP hang for some users.

diff --git a/lisp/nntp.el b/lisp/nntp.el
index 0fc3855..837f91f 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -828,8 +828,13 @@ command whose response triggered the error."
                             (progn (forward-line 1) (point))))
            (nntp-copy-to-buffer nntp-server-buffer (point-min) (point-max))
            (with-current-buffer nntp-server-buffer
-             (gnus-active-to-gnus-format method gnus-active-hashtb
-                                         nil t))))))))
+             (gnus-active-to-gnus-format
+              ;; Kludge to use the extended method name if you have
+              ;; an extended one.
+              (if (consp (gnus-info-method (car infos)))
+                  (gnus-info-method (car infos))
+                method)
+              gnus-active-hashtb nil t))))))))
 
 (deffoo nntp-retrieve-groups (groups &optional server)
   "Retrieve group info on GROUPS."