From 83dc6995148085966eddca749228a6338b7e6b0e Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Mon, 20 Nov 2006 06:50:29 +0000 Subject: Merge from erc--emacs--22 Merge from my ERC Emacs 22 integration branch. The version is now "5.2 stable pre-release". This will probably be the last change to the version of ERC in Emacs 22 before the release, pending any bugfixes. For details on the changes, see the lisp/erc/ChangeLog file. Note that ERC is now invoked with M-x erc, not M-x erc-select. If you were using the old `erc' function programmatically, use `erc-open' instead. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-520 Creator: Michael Olson --- etc/NEWS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc/NEWS') diff --git a/etc/NEWS b/etc/NEWS index 3730a489dc0..3766f16cb42 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1690,8 +1690,8 @@ ERC is a powerful, modular, and extensible IRC client for Emacs. To see what modules are available, type M-x customize-option erc-modules RET. -To start an IRC session, type M-x erc-select, and follow the prompts -for server, port, and nick. +To start an IRC session, type M-x erc, and follow the prompts for +server, port, and nick. --- ** Rcirc is now part of the Emacs distribution. -- cgit v1.2.1