From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 8 Jun 1997 12:25:25 +0000 (+0000)
Subject: (debug, debugger-eval-expression):
X-Git-Tag: emacs-20.1~1780
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29e2b496f036ee5456fc32f849974febf38b9765;p=emacs.git

(debug, debugger-eval-expression):
Treat overriding-terminal-local-map like overriding-local-map.
(debugger-outer-overriding-terminal-local-map): New variable.
---

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 763a1f3193c..e258533bf15 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -43,6 +43,7 @@
 (defvar debugger-outer-match-data)
 (defvar debugger-outer-load-read-function)
 (defvar debugger-outer-overriding-local-map)
+(defvar debugger-outer-overriding-terminal-local-map)
 (defvar debugger-outer-track-mouse)
 (defvar debugger-outer-last-command)
 (defvar debugger-outer-this-command)
@@ -83,6 +84,8 @@ first will be printed into the backtrace buffer."
 	(debugger-outer-match-data (match-data))
 	(debugger-outer-load-read-function load-read-function)
 	(debugger-outer-overriding-local-map overriding-local-map)
+	(debugger-outer-overriding-terminal-local-map
+	 overriding-terminal-local-map)
 	(debugger-outer-track-mouse track-mouse)
 	(debugger-outer-last-command last-command)
 	(debugger-outer-this-command this-command)
@@ -101,6 +104,7 @@ first will be printed into the backtrace buffer."
 	  last-input-event last-command-event last-nonmenu-event
 	  last-event-frame
 	  overriding-local-map
+	  overriding-terminal-local-map
 	  load-read-function
 	  (standard-input t) (standard-output t)
 	  (cursor-in-echo-area nil))
@@ -181,6 +185,8 @@ first will be printed into the backtrace buffer."
     ;; in case the user set them with the `e' command.
     (setq load-read-function debugger-outer-load-read-function)
     (setq overriding-local-map debugger-outer-overriding-local-map)
+    (setq overriding-terminal-local-map
+	  debugger-outer-overriding-terminal-local-map)
     (setq track-mouse debugger-outer-track-mouse)
     (setq last-command debugger-outer-last-command)
     (setq this-command debugger-outer-this-command)
@@ -328,12 +334,16 @@ Applies to the frame whose line point is on in the backtrace."
 	  (standard-output debugger-outer-standard-output)
 	  (cursor-in-echo-area debugger-outer-cursor-in-echo-area)
 	  (overriding-local-map debugger-outer-overriding-local-map)
+	  (overriding-terminal-local-map
+	   debugger-outer-overriding-terminal-local-map)
 	  (load-read-function debugger-outer-load-read-function))
       (store-match-data debugger-outer-match-data)
       (prog1 (eval-expression exp)
 	(setq debugger-outer-match-data (match-data))
 	(setq debugger-outer-load-read-function load-read-function)
 	(setq debugger-outer-overriding-local-map overriding-local-map)
+	(setq debugger-outer-overriding-terminal-local-map
+	      overriding-terminal-local-map)
 	(setq debugger-outer-track-mouse track-mouse)
 	(setq debugger-outer-last-command last-command)
 	(setq debugger-outer-this-command this-command)