[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Merge in yet another lost fragment from t
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Merge in yet another lost fragment from the 5.1 release branch. |
Date: |
Sun, 14 Oct 2007 00:48:17 -0400 |
commit b8b497b539df65514af5935652b30f26c61d594b
Author: Michael Olson <address@hidden>
Date: Tue Jun 27 07:12:37 2006 +0000
Merge in yet another lost fragment from the 5.1 release branch.
* erc.el (erc-open-ssl-stream): Merge in yet another lost fragment.
git-archimport-id: address@hidden/erc--main--0--patch-13
diff --git a/erc.el b/erc.el
index 171123d..fdc524a 100644
--- a/erc.el
+++ b/erc.el
@@ -2096,14 +2096,13 @@ 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 'tls)
- (let ((proc (open-tls-stream name buffer host port)))
+ (when (require 'ssl)
+ (let ((proc (open-ssl-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.
- ;; Disabled when switching to tls.el -- jas
- ;(sit-for 5)
+ (sit-for 5)
proc)))
;;; Debugging the protocol
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Merge in yet another lost fragment from the 5.1 release branch.,
mwolson <=