Merge changes from emacs-23

[bpt/emacs.git] / lisp / erc / ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 18fc5f1..bdc404c 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,37 @@
+2010-10-23  Julien Danjou  <julien@danjou.info>
+
+       * erc-backend.el (erc-server-JOIN): Set the correct target list on join.
+
+       * erc-backend.el (erc-process-sentinel): Check that buffer is alive
+       before setting it as current buffer.
+
+2010-10-14  Juanma Barranquero  <lekktu@gmail.com>
+
+       * erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring.
+
+2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * erc-list.el (erc-list-menu-mode-map): Declare and define in one step.
+
+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): 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.el (erc-toggle-debug-irc-protocol): Bind
+       erc-toggle-debug-irc-protocol to t.
+
+2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
+
+       * Version 23.2 released.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
        * Branch for 23.2.
@@ -12,8 +46,8 @@
        (erc-server-reconnect): Use it to reconnect via old
        connector (Bug#4958).
 
-       * erc.el (erc-determine-parameters): Save
-       erc-server-connect-function to erc-session-connector.
+       * erc.el (erc-determine-parameters):
+       Save erc-server-connect-function to erc-session-connector.
 
 2009-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>