From 92180ebd2eb944cc84f6e3c6f26a58b21374a79a Mon Sep 17 00:00:00 2001
From: Kelvin White <kwhite@gnu.org>
Date: Wed, 13 Aug 2014 09:14:43 -0400
Subject: * erc.el Disable display commands in current buffer, fix case where
 buffer name is already set

---
 lisp/erc/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lisp/erc/ChangeLog')

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index bf7e1924b52..dcde62af9c2 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-13  Kelvin White  <kwhite@gnu.org> 
+
+	* erc.el (erc-send-input): Disable display commands in current buffer
+	(erc-format-target-and/or-network): Fix cases when buffer name is set
+
 2014-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* erc-stamp.el (erc-timestamp-intangible): Disable by default because
-- 
cgit v1.2.1