* erc.el (erc-open-ssl-stream): Use tls.el.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3089502d114852fd40535d4c873cf8fc2b3533b3..98022b601e669cd23d2215e47cadb7ba831af299 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-30  Simon Josefsson  <jas@extundo.com>
+
+       * erc.el (erc-open-ssl-stream): Use tls.el.
+
 2006-01-30  Michael Olson  <mwolson@gnu.org>
 
        * erc-stamp.el (erc-timestamp-right-align-by-pixel): New option

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 9ff3ff51dc50b7b9dfcb19a9f55fa81d605f6c45..3c6baf1fdb4191e056cca5a9f5360b4ff53c322a 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2062,13 +2062,14 @@ Arguments are as to erc-select."
   "Open an SSL stream to an IRC server.
 The process will be given the name NAME, its target buffer will be
 BUFFER.         HOST and PORT specify the connection target."
-  (when (require 'ssl)
-    (let ((proc (open-ssl-stream name buffer host port)))
+  (when (require 'tls)
+    (let ((proc (open-tls-stream name buffer host port)))
       ;; Ugly hack, but it works for now. Problem is it is
       ;; very hard to detect when ssl is established, because s_client
       ;; doesn't give any CONNECTIONESTABLISHED kind of message, and
       ;; most IRC servers send nothing and wait for you to identify.
-      (sit-for 5)
+      ;; Disabled when switching to tls.el -- jas
+      ;(sit-for 5)
       proc)))
 
 ;;; Debugging the protocol