[gnus git] branch master updated: n0-13-44-g179b4b5

       via  179b4b59eaa86dc2483dff7e775d7808e21eabc4 (commit)
       via  b5967a238d4092da8069f7eef3b7213a242ff5a7 (commit)
      from  0927343ee10ff71f0a2c7afc742005fc51b6eee0 (commit)


- Log -----------------------------------------------------------------
commit 179b4b59eaa86dc2483dff7e775d7808e21eabc4
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Feb 24 20:47:33 2011 -0800

    Reverse the order of the ports to that the prompted-for port is first.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bd3ab6..ce91cd9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2011-02-25  Lars Ingebrigtsen  <[email protected]>
 
 	* nnimap.el (nnimap-stream): Doc fix.
+	(nnimap-open-connection-1): Reverse the order of the ports to that the
+	prompted-for port is first.
 
 	* gnus-start.el (gnus-get-unread-articles): Don't clobber the async
 	retrieval by the no-group selection.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 49f0781..c579261 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -338,7 +338,7 @@ textual parts.")
 		  (eq nnimap-stream 'starttls))
 	      (nnheader-message 7 "Opening connection to %s..."
 				nnimap-address)
-	      '("143" "imap"))
+	      '("imap" "143"))
 	     ((eq nnimap-stream 'shell)
 	      (nnheader-message 7 "Opening connection to %s via shell..."
 				nnimap-address)
@@ -346,16 +346,16 @@ textual parts.")
 	     ((memq nnimap-stream '(ssl tls))
 	      (nnheader-message 7 "Opening connection to %s via tls..."
 				nnimap-address)
-	      '("143" "993" "imap" "imaps"))
+	      '("imaps" "imap" "993" "143"))
 	     (t
 	      (error "Unknown stream type: %s" nnimap-stream))))
 	   (proto-stream-always-use-starttls t)
            login-result credentials)
       (when nnimap-server-port
-	(setq ports (append ports (list nnimap-server-port))))
+	(push nnimap-server-port ports))
       (destructuring-bind (stream greeting capabilities stream-type)
 	  (open-protocol-stream
-	   "*nnimap*" (current-buffer) nnimap-address (car (last ports))
+	   "*nnimap*" (current-buffer) nnimap-address (car ports)
 	   :type nnimap-stream
 	   :shell-command nnimap-shell-program
 	   :capability-command "1 CAPABILITY\r\n"

commit b5967a238d4092da8069f7eef3b7213a242ff5a7
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Feb 24 19:52:27 2011 -0800

    * nnimap.el (nnimap-stream): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19f6302..2bd3ab6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-02-25  Lars Ingebrigtsen  <[email protected]>
 
+	* nnimap.el (nnimap-stream): Doc fix.
+
 	* gnus-start.el (gnus-get-unread-articles): Don't clobber the async
 	retrieval by the no-group selection.
 
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index b273340..49f0781 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -62,8 +62,9 @@ it will default to `imap'.")
 
 (defvoo nnimap-stream 'undecided
   "How nnimap will talk to the IMAP server.
-Values are `ssl', `network', `starttls' or `shell'.
-The default is to try `ssl' first, and then `network'.")
+Values are `ssl', `network', `network-only, `starttls' or
+`shell'.  The default is to try `ssl' first, and then
+`network'.")
 
 (defvoo nnimap-shell-program (if (boundp 'imap-shell-program)
 				 (if (listp imap-shell-program)

-----------------------------------------------------------------------
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 |    4 ++++
 lisp/nnimap.el |   13 +++++++------
 2 files changed, 11 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, master has been updated


hooks/post-receive
-- 
Gnus Project