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 /man | |
| 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 'man')
| -rw-r--r-- | man/ChangeLog | 4 | ||||
| -rw-r--r-- | man/erc.texi | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/man/ChangeLog b/man/ChangeLog index 80f018955bd..c03f678bf1a 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2006-11-20 Michael Olson <mwolson@gnu.org> + + * erc.texi: Call this the 5.2 stable pre-release of ERC. + 2006-11-18 Chong Yidong <cyd@stupidchicken.com> * misc.texi (Interactive Shell): INSIDE_EMACS is set to t, diff --git a/man/erc.texi b/man/erc.texi index c4317f11511..0d535eae875 100644 --- a/man/erc.texi +++ b/man/erc.texi @@ -12,7 +12,7 @@ @syncodeindex fn cp @copying -This manual is for ERC version 5.1.4. +This manual is for ERC version 5.2 stable pre-release. Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc. @@ -271,7 +271,7 @@ itself. An example follows. (require 'erc) @end lisp -Once ERC is loaded, the command @kbd{M-x erc-select} will start ERC and +Once ERC is loaded, the command @kbd{M-x erc} will start ERC and prompt for the server to connect to. @c PRE5_2: Sample session, including: @@ -520,11 +520,11 @@ Translate morse code in messages @section Connecting to an IRC Server @cindex connecting -The easiest way to connect to an IRC server is to call -@kbd{M-x erc-select}. If you want to assign this function to a -keystroke, the following will help you figure out its parameters. +The easiest way to connect to an IRC server is to call @kbd{M-x erc}. +If you want to assign this function to a keystroke, the following will +help you figure out its parameters. -@defun erc-select +@defun erc Select connection parameters and run ERC. Non-interactively, it takes the following keyword arguments. @@ -543,7 +543,7 @@ That is, if called with the following arguments, @var{server} and parameters. @example -(erc-select :server "irc.freenode.net" :full-name "Harry S Truman") +(erc :server "irc.freenode.net" :full-name "Harry S Truman") @end example @end defun |