(nnimap-open-connection): Prepare to support open-gnutls-stream.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b283e39..ba4f460 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-open-connection): Prepare to support
+       open-gnutls-stream.
+
        * shr.el: Rearrange function order to be more logical.
 
 2010-10-06  Julien Danjou  <julien@danjou.info>

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index d56e2f4..7d935e4 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -317,13 +317,16 @@ textual parts.")
                   'starttls))
                '("imap"))
               ((memq nnimap-stream '(ssl tls))
-               (open-tls-stream
-                "*nnimap*" (current-buffer) nnimap-address
-                (setq port
-                      (or nnimap-server-port
-                          (if (netrc-find-service-number "imaps")
-                              "imaps"
-                            "993"))))
+               (funcall (if (and nil
+                                 (fboundp 'open-gnutls-stream))
+                            'open-gnutls-stream
+                          'open-tls-stream)
+                        "*nnimap*" (current-buffer) nnimap-address
+                        (setq port
+                              (or nnimap-server-port
+                                  (if (netrc-find-service-number "imaps")
+                                      "imaps"
+                                    "993"))))
                '("143" "993" "imap" "imaps"))
               (t
                (error "Unknown stream type: %s" nnimap-stream))))