Changeset 4148 for trunk/lisp/emacs-lisp/edebug.el

Timestamp:

08/18/06 08:35:31 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/emacs-lisp/edebug.el (modified) (8 diffs)

trunk/lisp/emacs-lisp/edebug.el

@@ -2557 +2557 @@
-        (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
@@ -2575 +2576 @@
-              (cursor-in-echo-area nil)
-              (default-cursor-in-non-selected-windows t)
+              (unread-command-events unread-command-events)
-              ;; any others??
-              )
@@ -2663 +2665 @@
-           (t (message "")))
-
+          (setq unread-command-events nil)
-          (if (eq 'after edebug-arg-mode)
-              (progn
@@ -2682 +2685 @@
-            (edebug-sit-for edebug-sit-for-seconds)) ; Force update and pause.
-           ((eq edebug-execution-mode 'Trace-fast)
-
-
+
-
-          (unwind-protect
@@ -2779 +2781 @@
-      ;; 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
@@ -2869 +2872 @@
-        (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)
@@ -2891 +2893 @@
-              (last-input-event nil)
-              (last-command-event nil)
-              (unread-command-events nil)
-              (last-event-frame nil)
-              (last-nonmenu-event nil)
@@ -2951 +2952 @@
-       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