* nnimap.el (nnimap-open-connection): Fix open-tls-stream call.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a2a94c7..912b767 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 2010-10-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

+       * nnimap.el (nnimap-open-connection): Fix open-tls-stream call.
+

        * shr.el (shr-find-fill-point): Use a filling algorithm that should
        probably work for CJVK text, too.
 
        * shr.el (shr-find-fill-point): Use a filling algorithm that should
        probably work for CJVK text, too.
 

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 1109f1e..2faa2be 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -321,8 +321,7 @@ textual parts.")
                (let ((tls-program "openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof -starttls imap"))
                  (open-tls-stream
                   "*nnimap*" (current-buffer) nnimap-address
                (let ((tls-program "openssl s_client %s -connect %h:%p -no_ssl2 -ign_eof -starttls imap"))
                  (open-tls-stream
                   "*nnimap*" (current-buffer) nnimap-address

-                  (setq port (or nnimap-server-port "imap"))
-                  'starttls))
+                  (setq port (or nnimap-server-port "imap"))))

                '("imap"))
               ((memq nnimap-stream '(ssl tls))
                (funcall (if (fboundp 'open-gnutls-stream)
                '("imap"))
               ((memq nnimap-stream '(ssl tls))
                (funcall (if (fboundp 'open-gnutls-stream)