X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/26d078a69e2251efc65d1a25c3f59ceca50de87d..9c5a5c77000b452bdf3ee98e366d5ee6df54b5a4:/lisp/erc/ChangeLog

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index ec154fb7ef..46c93ccebd 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,18 @@
+2013-12-28  Glenn Morris  <rgm@gnu.org>
+
+	* erc-log.el (erc-log-file-coding-system): Specify custom type.
+
+	* erc-button.el (erc-button-alist): Fix custom type.
+
+2013-11-25  Glenn Morris  <rgm@gnu.org>
+
+	* erc-button.el (erc-nick-popup): Make `nick' available in the
+	eval environment.  (Bug#15969)
+
+2013-11-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* erc-pcomplete.el (erc-pcomplete): Set this-command.
+
 2013-09-21  Glenn Morris  <rgm@gnu.org>
 
 	* erc.el (erc-invite-only-mode, erc-toggle-channel-mode):