diff options
| author | Miles Bader <miles@gnu.org> | 2006-11-20 06:50:29 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-11-20 06:50:29 +0000 |
| commit | 83dc6995148085966eddca749228a6338b7e6b0e (patch) | |
| tree | 0fbf7066385873a51749737e5ac0d9c57b8a3d28 /etc | |
| parent | e15a04955b0c59069aa870d7d5040bc2e795b2eb (diff) | |
| download | emacs-83dc6995148085966eddca749228a6338b7e6b0e.tar.gz | |
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 <mwolson@gnu.org>
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 9 | ||||
| -rw-r--r-- | etc/ERC-NEWS | 16 | ||||
| -rw-r--r-- | etc/NEWS | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 003b625c3f3..5d43d90da42 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2006-11-20 Michael Olson <mwolson@gnu.org> + + * NEWS: Change M-x erc-select to M-x erc. + 2006-11-20 Sun Yijiang <sunyijiang@gmail.com> * TUTORIAL.cn: Updated. @@ -92,6 +96,11 @@ * PROBLEMS (are): Emacs compiled with Gtk+ crashes when closing a display (x-close-connection). +2006-09-03 Diane Murray <disumu@x3y2z1.net> + + * erc.texi (Getting Started, Connecting): Changed erc-select to + erc. + 2006-09-02 Juri Linkov <juri@jurta.org> * HELLO: Regroup Europe Non-ASCII examples by similar scripts. diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 3a026ee1162..cce444749c4 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -1,5 +1,21 @@ ERC NEWS -*- outline -*- +* Changes in ERC 5.2 (stable pre-release for Emacs 22) + +** M-x erc RET now starts ERC. +`erc-select' has been changed to `erc'. `erc-select' still remains as +an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to +`erc-ssl' with `erc-select-ssl' as its alias. The function that was +known as `erc' is now `erc-open'. + +** Changes and additions to modules + +*** Channel tracking (erc-track.el) + +**** Use mouse-face and help-echo for channel names in the mode-line. +This helps people using a mouse know that they are buttons and can be +clicked on. + * Changes in ERC 5.1.4 ** Make find-function and find-variable work in Emacs 22 for @@ -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. |