[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Merge changes that were pending in the 5.
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Merge changes that were pending in the 5.1 release branch. |
Date: |
Sun, 14 Oct 2007 00:48:17 -0400 |
commit 578064a4f2c1ea639b49ca0eccd2b0397c45e3db
Author: Michael Olson <address@hidden>
Date: Tue Jun 27 07:07:12 2006 +0000
Merge changes that were pending in the 5.1 release branch.
git-archimport-id: address@hidden/erc--main--0--patch-11
diff --git a/ChangeLog b/ChangeLog
index 4153c64..353f2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -291,6 +291,11 @@
* erc.el (erc-modules): Added `capab-identify' to options.
(erc-get-parsed-vector, erc-get-parsed-vector-nick)
(erc-get-parsed-vector-type): Moved here from erc-match.el.
+ (erc-version-string): Remove "(CVS)".
+ (erc-open-ssl-stream): Go back to using ssl.el so that SSL
+ connections work as expected. Connecting with `open-tls-stream'
+ only seems to work (if at all?) when using the tls.el located in
+ lisp/net/ in Emacs22.
* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
(erc-get-parsed-vector-type): Moved these functions to erc.el
@@ -299,7 +304,7 @@
* CREDITS: Added erc-capab.el. List both erc-nickserv.el and
erc-services.el since the file name has changed.
- * NEWS: Added erc-capab.el.
+ * NEWS: Added erc-capab.el. Added tls.el -> ssl.el change.
* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
to "ERC".
diff --git a/NEWS b/NEWS
index 3f8e955..6887a94 100644
--- a/NEWS
+++ b/NEWS
@@ -55,6 +55,10 @@ to make the BBDB buffer electric. This defaults to not
electric.
* Changes in ERC 5.1.2
+** Go back to using ssl.el so that SSL connections work as expected.
+Connecting with `open-tls-stream' only seems to work (if at all?) when
+using the tls.el located in lisp/net/ in Emacs22.
+
** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
** Move to end of prompt when ERC reconnects to a server.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Merge changes that were pending in the 5.1 release branch.,
mwolson <=