Merge from erc--main--0
commit75589a1a011f3d445c617962abdf693c0325cd3f
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)
treed3b2c9fbf83e00b353f8278fdfffdf4db9b6d8e5
parentd761774da1e3e09b55a963eca54b5c6ef5e1a4e2
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