1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64fedd32191..520e41afc68 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * electric.el (electric-indent-inhibit): New var.
+        (electric-indent-post-self-insert-function): Use it.
+        * progmodes/python.el (python-mode): Set it.
+
         * progmodes/ruby-mode.el (ruby-smie-rules): Tweak handling of
         open braces.