(edebug-enter): Save, and bind to nil,

overriding-local-map and overriding-terminal-local-map.

1 files changed, 11 insertions, 0 deletions

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 442f2cdbf0c..431b15272e7 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2232,6 +2232,9 @@ expressions; a `progn' form will be returned enclosing these forms."
 (defvar edebug-outside-debug-on-error) ; the value of debug-on-error outside
 (defvar edebug-outside-debug-on-quit) ; the value of debug-on-quit outside
 
+(defvar edebug-outside-overriding-local-map)
+(defvar edebug-outside-overriding-terminal-local-map)
+
 (defvar edebug-outside-pre-command-hook)
 (defvar edebug-outside-post-command-hook)
 
@@ -2292,6 +2295,10 @@ error is signaled again."
 	    ;; Lexical bindings must be uncompiled for this to work.
 	    (cl-lexical-debug t)
 
+	    (edebug-outside-overriding-local-map overriding-local-map)
+	    (edebug-outside-overriding-terminal-local-map
+	     overriding-terminal-local-map)
+
 	    ;; Save the outside value of executing macro.  (here??)
 	    (edebug-outside-executing-macro executing-kbd-macro)
 	    (edebug-outside-pre-command-hook pre-command-hook)
@@ -2303,6 +2310,10 @@ error is signaled again."
 		  (executing-kbd-macro 
 		   (if edebug-continue-kbd-macro executing-kbd-macro))
 
+		  ;; Don't get confused by the user's keymap changes.
+		  (overriding-local-map nil)
+		  (overriding-terminal-local-map nil)
+
 		  (signal-hook-function 'edebug-signal)
 
 		  ;; Disable command hooks.  This is essential when