Update from erc--emacs--22

Highlights:
 - Remove contributions from someone who has not assigned changes yet.
 - Merge in a couple of bug-fixes from the main branch.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-546
Creator:  Michael Olson <mwolson@gnu.org>

1 files changed, 21 insertions, 0 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index dfb6fc7afe8..8e2a23d261a 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,14 @@
+2006-12-08  Michael Olson  <mwolson@gnu.org>
+
+        * erc.el: Re-evaluate contributions from a contributor, and found
+        them under 15 lines of non-obvious code, so it is safe to remove
+        the copyright notice.
+        (erc-modules): Remove list module.
+
+        * erc-list.el: Remove, since a contributor who has not completed
+        their assignment has contributed significantly more than 15 lines
+        of code to this file.
+
 2006-11-28  Juanma Barranquero  <lekktu@gmail.com>
 
         * erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
@@ -18,6 +29,11 @@
         (erc-update-current-channel-member, erc-load-script):
         (erc-mode-line-away-status-format): Doc fixes.
 
+2006-11-20  Andrea Russo  <rastandy@inventati.org>
+
+        * erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
+        before calling `erc-display-prompt'.
+
 2006-11-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * erc.el (erc-after-connect, erc-open-ssl-stream)
@@ -86,6 +102,11 @@
         `erc-show-my-nick' is non-nil.
         (erc-compute-server): Doc fix.
 
+2006-10-01  John J Foerch  <jjfoerch@earthlink.net>
+
+        * erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
+        from the erc-timestamp field.
+
 2006-09-11  Michael Olson  <mwolson@gnu.org>
 
         * erc-nicklist.el (erc-nicklist-insert-contents): Add missing