Merge from erc--main--0
authorMiles Bader <miles@gnu.org>
Wed, 17 Jan 2007 18:17:25 +0000 (18:17 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 17 Jan 2007 18:17:25 +0000 (18:17 +0000)
commit6904f7fe8ed11bf4c94c009b4ef300f4ccdfa2e6
tree5d3f9cf0ca50143225d6e0622620942f90d90d78
parentc5f847b6b3c1733731e079c3adaca0c30ed69522
Merge from erc--main--0

Highlights:

 - Display messages starting with "/" but are not commands correctly.
 - Add erc-capab.el file, with capab-identify module.
 - Fix various ERC menu bugs and add "Current channel" submenu.
 - Make header-line display look nicer.
 - Fix warning when auto-authenticating to bitlbee.
 - New option erc-system-name allows the hostname next to your nick to be
   customized.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-599
Creator:  Michael Olson <mwolson@gnu.org>
12 files changed:
etc/ChangeLog
etc/ERC-NEWS
lisp/erc/ChangeLog
lisp/erc/erc-backend.el
lisp/erc/erc-capab.el [new file with mode: 0644]
lisp/erc/erc-dcc.el
lisp/erc/erc-menu.el
lisp/erc/erc-services.el
lisp/erc/erc-track.el
lisp/erc/erc.el
man/ChangeLog
man/erc.texi