Sync from upstream ERC

2 files changed, 8 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2e6ae072c8b..d9f9f0722f1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-29  Michael Olson  <mwolson@gnu.org>
+
+        * ERC-NEWS: Update for recent change.
+
 2007-10-27  Juanma Barranquero  <lekktu@gmail.com>
 
         * .cvsignore: Add *.pyc.
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 53b595a753f..2d2e0d8164c 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -11,6 +11,10 @@ It requires the tls.el library.
 ** The function `erc-ssl' will now always use ssl.el, even in the version
 of ERC that comes with Emacs.
 
+** Type `C-u' before `C-c C-j' to prompt for a channel key
+`erc-join-channel' now accepts a prefix-argument to prompt for the key
+when channels are protected by keywords.
+
 ** Changes and additions to modules
 
 *** Channel tracking (erc-track.el)