[gnus git] branch master updated: =2= Add a kludge to use the given method as in the group name if we're using an extended method. ; Extend the methods so that we're sure to get unique server names.

       via  a342fd73da8057b70a08ca63aa9fbd0ccdc2eb83 (commit)
       via  5445e8ddd407f0e0a48f592d8d5c7273e76316ca (commit)
      from  2f98643e46bf480b4d0506d191d879adf56a237a (commit)


- Log -----------------------------------------------------------------
commit a342fd73da8057b70a08ca63aa9fbd0ccdc2eb83
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sun Feb 20 21:01:59 2011 -0800

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ebc324..31a3828 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-21  Lars Ingebrigtsen  <[email protected]>
 
+	* 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
--- 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."

commit 5445e8ddd407f0e0a48f592d8d5c7273e76316ca
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sun Feb 20 20:54:10 2011 -0800

    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/ChangeLog b/lisp/ChangeLog
index 2797ff3..4ebc324 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-21  Lars Ingebrigtsen  <[email protected]>
+
+	* 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.
+
 2011-02-21  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* gnus.el: No Gnus v0.11 is released.
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index b493a93..e5e2468 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1675,7 +1675,20 @@ If SCAN, request a scan of that group as well."
 		(lambda (c1 c2)
 		  (< (gnus-method-rank (cadr c1) (car c1))
 		     (gnus-method-rank (cadr c2) (car c2))))))
-
+    ;; Go through the list of servers and possibly extend methods that
+    ;; aren't equal (and that need extension; i.e., they are async).
+    (let ((methods nil))
+      (dolist (elem type-cache)
+	(destructuring-bind (method method-type infos dummy) elem
+	  (let ((gnus-opened-servers methods))
+	    (when (and (gnus-similar-server-opened method)
+		       (gnus-check-backend-function
+			'retrieve-group-data-early (car method)))
+	      (setq method (gnus-server-extend-method
+			    (gnus-info-group (car infos))
+			    method))
+	      (setcar elem method))
+	    (push (list method 'ok) methods)))))
     ;; Start early async retrieval of data.
     (dolist (elem type-cache)
       (destructuring-bind (method method-type infos dummy) elem

-----------------------------------------------------------------------
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     |    9 +++++++++
 lisp/gnus-start.el |   15 ++++++++++++++-
 lisp/nntp.el       |    9 +++++++--
 3 files changed, 30 insertions(+), 3 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, master has been updated


hooks/post-receive
-- 
Gnus Project