1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2d1747795c..f0ea7a93526 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
 2013-11-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-        * textmodes/text-mode.el (paragraph-indent-minor-mode): Use add-function.
+        * electric.el (electric-indent-mode-map): Remove.
+        (electric-indent-mode): Change the global-map instead (bug#15915).
+
+        * textmodes/text-mode.el (paragraph-indent-minor-mode):
+        Use add-function.
 
 2013-11-17  Stefan Monnier  <monnier@iro.umontreal.ca>