[gnus git] branch master updated: n0-17-148-g0423b87 =1= Backport :end-of-capability fixes from Emacs 24 open-network-stream for pop3.el.

       via  0423b87a0e0f8d3de7ddd308fbfb42ae1ddad960 (commit)
      from  8a2a4e6e9c61c5594a5ba0367a93280ae1f5d5ce (commit)


- Log -----------------------------------------------------------------
commit 0423b87a0e0f8d3de7ddd308fbfb42ae1ddad960
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Sun Jul 3 15:54:17 2011 +0200

    Backport :end-of-capability fixes from Emacs 24 open-network-stream
    for pop3.el.

diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 13afd4d..50ea05b 100644
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -94,6 +94,10 @@ PARAMETERS should be a sequence of keywords and values:
 :end-of-command specifies a regexp matching the end of a command.
   If non-nil, it defaults to \"\\n\".
 
+:end-of-capability specifies a regexp matching the end of the
+  response to the command specified for :capability-command.
+  It defaults to the regexp specified for :end-of-command.
+
 :success specifies a regexp matching a message indicating a
   successful STARTTLS negotiation.  For instance, the default
   should be \"^3\" for an NNTP connection.
@@ -151,12 +155,15 @@ PARAMETERS should be a sequence of keywords and values:
 	 (success-string     (plist-get parameters :success))
 	 (capability-command (plist-get parameters :capability-command))
 	 (eoc                (plist-get parameters :end-of-command))
+ 	 (eo-capa            (or (plist-get parameters :end-of-capability)
+ 				 eoc))
 	 ;; Return (STREAM GREETING CAPABILITIES RESULTING-TYPE)
 	 (stream (open-network-stream name buffer host service))
 	 (greeting (proto-stream-get-response stream start eoc))
 	 (capabilities (when capability-command
 			 (proto-stream-command stream
-					       capability-command eoc)))
+					       capability-command
+					       (or eo-capa eoc))))
 	 (resulting-type 'plain)
 	 (builtin-starttls (and (fboundp 'gnutls-available-p)
 				(gnutls-available-p)))
@@ -200,7 +207,7 @@ PARAMETERS should be a sequence of keywords and values:
 	    (proto-stream-get-response stream start eoc)))
 	;; Re-get the capabilities, which may have now changed.
 	(setq capabilities
-	      (proto-stream-command stream capability-command eoc))))
+	      (proto-stream-command stream capability-command eo-capa))))
 
     ;; If TLS is mandatory, close the connection if it's unencrypted.
     (and require-tls

-----------------------------------------------------------------------
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/proto-stream.el |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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