From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 10 Aug 2006 15:27:41 +0000 (+0000)
Subject: * emacs-lisp/edebug.el (edebug-recursive-edit): Don't save and
X-Git-Tag: emacs-pretest-22.0.90~1047
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a799327579db6f05aeaf4a9cf6f9ae73e8cae88;p=emacs.git

* emacs-lisp/edebug.el (edebug-recursive-edit): Don't save and
	restore unread-command-events here.
	(edebug-display): Do it here, to detect sit-for interruptions.
---

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 8645ec5a6ed..e7f5a736ded 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2556,6 +2556,7 @@ MSG is printed after `::::} '."
 	(edebug-outside-buffer (current-buffer))
 	(edebug-outside-point (point))
  	(edebug-outside-mark (edebug-mark))
+	(edebug-outside-unread-command-events unread-command-events)
 	edebug-outside-windows		; window or screen configuration
 	edebug-buffer-points
 
@@ -2574,6 +2575,7 @@ MSG is printed after `::::} '."
 	      (overlay-arrow-string overlay-arrow-string)
 	      (cursor-in-echo-area nil)
 	      (default-cursor-in-non-selected-windows t)
+	      (unread-command-events nil)
 	      ;; any others??
 	      )
 	  (if (not (buffer-name edebug-buffer))
@@ -2681,8 +2683,7 @@ MSG is printed after `::::} '."
 	   ((eq edebug-execution-mode 'trace)
 	    (edebug-sit-for edebug-sit-for-seconds)) ; Force update and pause.
 	   ((eq edebug-execution-mode 'Trace-fast)
-	    (edebug-sit-for 0))		; Force update and continue.
-	   )
+	    (edebug-sit-for 0)))		; Force update and continue.
 
 	  (unwind-protect
 	      (if (or edebug-stop
@@ -2778,6 +2779,7 @@ MSG is printed after `::::} '."
       (with-timeout-unsuspend edebug-with-timeout-suspend)
       ;; Reset global variables to outside values in case they were changed.
       (setq
+       unread-command-events edebug-outside-unread-command-events
        overlay-arrow-position edebug-outside-o-a-p
        overlay-arrow-string edebug-outside-o-a-s
        cursor-in-echo-area edebug-outside-c-i-e-a
@@ -2868,7 +2870,6 @@ MSG is printed after `::::} '."
 
 	(edebug-outside-last-input-event last-input-event)
 	(edebug-outside-last-command-event last-command-event)
-	(edebug-outside-unread-command-events unread-command-events)
 	(edebug-outside-last-event-frame last-event-frame)
 	(edebug-outside-last-nonmenu-event last-nonmenu-event)
 	(edebug-outside-track-mouse track-mouse)
@@ -2890,7 +2891,6 @@ MSG is printed after `::::} '."
 	      ;; More for Emacs 19
 	      (last-input-event nil)
 	      (last-command-event nil)
-	      (unread-command-events nil)
 	      (last-event-frame nil)
 	      (last-nonmenu-event nil)
 	      (track-mouse nil)
@@ -2950,7 +2950,6 @@ MSG is printed after `::::} '."
        last-command edebug-outside-last-command
        this-command edebug-outside-this-command
        unread-command-char edebug-outside-unread-command-char
-       unread-command-events edebug-outside-unread-command-events
        current-prefix-arg edebug-outside-current-prefix-arg
        last-input-char edebug-outside-last-input-char
        last-input-event edebug-outside-last-input-event