* nnimap.el (nnimap-open-connection): Allow tls as a synonym for ssl.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43abd0c..800f761 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-open-connection): Allow tls as a synonym for ssl.
+
        * dgnushack.el (iswitchb): Require to shut up the compiler.
 
        * shr.el (shr-ensure-paragraph): Fix the non-empty line case.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 0aaa797..0e6a047 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -316,7 +316,7 @@ textual parts.")
                   (setq port (or nnimap-server-port "imap"))
                   'starttls))
                '("imap"))
-              ((eq nnimap-stream 'ssl)
+              ((memq nnimap-stream '(ssl tls))
                (open-tls-stream
                 "*nnimap*" (current-buffer) nnimap-address
                 (setq port