1 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 202b41891eb..f24ccb3aaa6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2012-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/edebug.el (edebug-enter): Don't mess with
+        overriding-local-map and pre/post-command-hook here.
+        (edebug-recursive-edit): Do it here instead (bug#12345).
+        (edebug-outside-unread-command-char): Remove all uses of
+        unread-command-char.
+
         * emacs-lisp/debug.el (debug): Don't bind debug-on-error since
         inhibit-debugger is bound instead.