summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2007-09-08 03:07:09 +0000
committerMichael Olson <mwolson@gnu.org>2007-09-08 03:07:09 +0000
commit3b701278a91ad923b01ea176faad6b8cb2ed67c5 (patch)
treedc71593b4c29d094ea62089df46f716601f7b738 /etc
parenteab6d21056becae29e1a109c666a9275a3edc038 (diff)
downloademacs-3b701278a91ad923b01ea176faad6b8cb2ed67c5.tar.gz
Sync ERC 5.3 (devel) from upstream
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/ERC-NEWS16
2 files changed, 21 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index a7edd37f585..03eab2c13e7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-08 Michael Olson <mwolson@gnu.org>
+
+ * ERC-NEWS: Update for changes to the development version of ERC
+ 5.3.
+
2007-09-06 Glenn Morris <rgm@gnu.org>
* ctags.1, emacs.1, emacsclient.1, etags.1: Move from etc/ to
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index f5bf1e89dde..409dcf03da6 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -3,6 +3,22 @@ ERC NEWS -*- outline -*-
Copyright (C) 2006, 2007 Free Software Foundation, Inc.
See the end of the file for license conditions.
+* Changes in ERC 5.3
+
+** New function `erc-tls' is to be used for connecting to a server via TLS.
+The function `erc-ssl' should never be used for that purpose any
+longer, which was the case with the version of ERC that is included
+with Emacs.
+
+** Changes and additions to modules
+
+*** Channel tracking (erc-track.el)
+
+If erc-track-position-in-mode-line is set to nil, the tracking
+information won't be shown in the mode line, which is a change
+from the previous behavior of showing it "After all other
+information".
+
* Changes in ERC 5.2
** M-x erc RET now starts ERC.