From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Sat, 9 Oct 2010 13:58:51 +0000 (+0200)
Subject: If we have gnutls loaded, then try to use that for the tls stream.
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=10cd504c5b21ba5c95bae62bf558c0218472f310

If we have gnutls loaded, then try to use that for the tls stream.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1605235a3..75db5dc24 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* nnimap.el (nnimap-open-connection): If we have gnutls loaded, then
+	try to use that for the tls stream.
+
 2010-10-09  Julien Danjou  <julien@danjou.info>
 
 	* nnir.el (nnir-read-parm): Fix call to gnus-completing-read.
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f8eb6659a..33e37ed45 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -317,8 +317,7 @@ textual parts.")
 		   'starttls))
 		'("imap"))
 	       ((memq nnimap-stream '(ssl tls))
-		(funcall (if (and nil
-				  (fboundp 'open-gnutls-stream))
+		(funcall (if (fboundp 'open-gnutls-stream)
 			     'open-gnutls-stream
 			   'open-tls-stream)
 			 "*nnimap*" (current-buffer) nnimap-address