Merge from erc--main--0
commit01d9e862ba3a2f22b17e95c7086648f56415c357
authorMiles Bader <miles@gnu.org>
Wed, 17 Jan 2007 18:17:35 +0000 (17 18:17 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 17 Jan 2007 18:17:35 +0000 (17 18:17 +0000)
treeb4181d14baf62c146585e93edec7a7d4aa3d0d96
parent6904f7fe8ed11bf4c94c009b4ef300f4ccdfa2e6
Merge from erc--main--0

Backport additional functions and macros that erc-capab.el needs.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-600
Creator:  Michael Olson <mwolson@gnu.org>
lisp/erc/ChangeLog
lisp/erc/erc.el