summaryrefslogtreecommitdiff
path: root/lisp/erc/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc/ChangeLog')
-rw-r--r--lisp/erc/ChangeLog20
1 files changed, 12 insertions, 8 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 210f6985dc9..879dd228562 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-13 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * erc.el (erc-mode):
+ * erc-dcc.el (erc-dcc-chat-mode): Use define-derived-mode.
+
2010-11-11 Glenn Morris <rgm@gnu.org>
* erc-lang.el (erc-cmd-LANG): Fix what may have been a typo.
@@ -25,17 +30,17 @@
2010-08-14 Vivek Dasmohapatra <vivek@etla.org>
* erc-join.el (erc-autojoin-timing, erc-autojoin-delay): New vars.
- (erc-autojoin-channels-delayed, erc-autojoin-after-ident): New
- functions.
+ (erc-autojoin-channels-delayed, erc-autojoin-after-ident):
+ New functions.
(erc-autojoin-channels): Allow autojoining after ident (Bug#5521).
2010-08-08 Fran Litterio <flitterio@gmail.com>
- * erc-backend.el (erc-server-filter-function): Call
- erc-log-irc-protocol.
+ * erc-backend.el (erc-server-filter-function):
+ Call erc-log-irc-protocol.
- * erc.el (erc-toggle-debug-irc-protocol): Bind
- erc-toggle-debug-irc-protocol to t.
+ * erc.el (erc-toggle-debug-irc-protocol):
+ Bind erc-toggle-debug-irc-protocol to t.
2010-05-07 Chong Yidong <cyd@stupidchicken.com>
@@ -126,7 +131,7 @@
See ChangeLog.08 for earlier changes.
- Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2009-2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -148,4 +153,3 @@ See ChangeLog.08 for earlier changes.
;; add-log-time-zone-rule: t
;; End:
-;; arch-tag: d4703244-4a8d-49b1-ab34-ad0d56600ef8