From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Mon, 4 Oct 2010 16:27:03 +0000 (+0200)
Subject: * nnimap.el (nnimap-open-connection): Allow tls as a synonym for ssl.
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=6a7c34220b95bc981b36af449fe1ed9d68ba709a

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43abd0c6a..800f761a0 100644
--- 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 0aaa797b8..0e6a04705 100644
--- 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