From: Simon Josefsson <jas@extundo.com>
Date: Tue, 31 Jan 2006 15:30:53 +0000 (+0000)
Subject: * erc.el (erc-open-ssl-stream): Use tls.el.
X-Git-Tag: emacs-pretest-22.0.90~4478
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=176cc13b336e2ae3f0d11a3f95881ff48065677f;p=emacs.git

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

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3089502d114..98022b601e6 100644
--- 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 9ff3ff51dc5..3c6baf1fdb4 100644
--- 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