diff etc/ERC-NEWS @ 85743:763be5e829a7

Sync from upstream ERC
author Michael Olson <mwolson@gnu.org>
date Mon, 29 Oct 2007 01:00:33 +0000
parents de15045ac6fe
children 107ccd98fa12
line wrap: on
line diff
--- a/etc/ERC-NEWS	Mon Oct 29 00:51:51 2007 +0000
+++ b/etc/ERC-NEWS	Mon Oct 29 01:00:33 2007 +0000
@@ -11,6 +11,10 @@
 ** 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)