Mercurial > emacs

changeset 68499:04ad8d666956

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* erc.el (erc-open-ssl-stream): Use tls.el.
author Simon Josefsson <jas@extundo.com>
date Tue, 31 Jan 2006 15:30:53 +0000
parents 528aecb860cf
children 4e4d545ce006
files lisp/erc/ChangeLog lisp/erc/erc.el
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/erc/ChangeLog	Tue Jan 31 00:24:36 2006 +0000
+++ b/lisp/erc/ChangeLog	Tue Jan 31 15:30:53 2006 +0000
@@ -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
--- a/lisp/erc/erc.el	Tue Jan 31 00:24:36 2006 +0000
+++ b/lisp/erc/erc.el	Tue Jan 31 15:30:53 2006 +0000
@@ -2062,13 +2062,14 @@
   "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