diff options
| author | Michael Olson <mwolson@gnu.org> | 2007-10-29 01:00:33 +0000 |
|---|---|---|
| committer | Michael Olson <mwolson@gnu.org> | 2007-10-29 01:00:33 +0000 |
| commit | b6675b2d62e7962cd924051f5d30d2cd7deede66 (patch) | |
| tree | 58b6ae7414eadc169f812711c40dd4e1f6c113fc /etc/ERC-NEWS | |
| parent | 08446d5eeb448b3473daa4e209ccf71ceef496b5 (diff) | |
| download | emacs-b6675b2d62e7962cd924051f5d30d2cd7deede66.tar.gz | |
Sync from upstream ERC
Diffstat (limited to 'etc/ERC-NEWS')
| -rw-r--r-- | etc/ERC-NEWS | 4 |
1 files changed, 4 insertions, 0 deletions
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) |