diff options
| author | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
| commit | 4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch) | |
| tree | 2e22bd79984f0772c43e294babc07c1508ce95ce /lisp/erc/ChangeLog | |
| parent | b44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff) | |
| parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
| download | emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.bz2 emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
Diffstat (limited to 'lisp/erc/ChangeLog')
| -rw-r--r-- | lisp/erc/ChangeLog | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index dfb6fc7afe8..c8c1cb56b54 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,23 @@ +2006-12-13 Leo <sdl.web@gmail.com> + + * erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it + isn't active already, instead of leaving it on. + +2006-12-10 Juanma Barranquero <lekktu@gmail.com> + + * erc-ezbounce.el (erc-ezb-init-session-list): Doc fix. + +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 +38,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 +111,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 |