[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el [lexbind]

[Miles Bader]

Index: emacs/lisp/emacs-lisp/debug.el
diff -c emacs/lisp/emacs-lisp/debug.el:1.55.2.1 
emacs/lisp/emacs-lisp/debug.el:1.55.2.2
*** emacs/lisp/emacs-lisp/debug.el:1.55.2.1     Fri Apr  4 01:20:16 2003
--- emacs/lisp/emacs-lisp/debug.el      Tue Oct 14 19:32:21 2003
***************
*** 1,6 ****
  ;;; debug.el --- debuggers and related commands for Emacs
  
! ;; Copyright (C) 1985, 1986, 1994, 2001 Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: lisp, tools, maint
--- 1,6 ----
  ;;; debug.el --- debuggers and related commands for Emacs
  
! ;; Copyright (C) 1985, 1986, 1994, 2001, 2003  Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
  ;; Keywords: lisp, tools, maint
***************
*** 128,134 ****
          (debugger-outer-track-mouse track-mouse)
          (debugger-outer-last-command last-command)
          (debugger-outer-this-command this-command)
!         (debugger-outer-unread-command-char unread-command-char)
          (debugger-outer-unread-command-events unread-command-events)
          (debugger-outer-unread-post-input-method-events
           unread-post-input-method-events)
--- 128,135 ----
          (debugger-outer-track-mouse track-mouse)
          (debugger-outer-last-command last-command)
          (debugger-outer-this-command this-command)
!         (debugger-outer-unread-command-char
!          (with-no-warnings unread-command-char))
          (debugger-outer-unread-command-events unread-command-events)
          (debugger-outer-unread-post-input-method-events
           unread-post-input-method-events)
***************
*** 145,151 ****
        (setq overriding-terminal-local-map nil)
        ;; Don't let these magic variables affect the debugger itself.
        (let ((last-command nil) this-command track-mouse
!           (unread-command-char -1) unread-command-events
            unread-post-input-method-events
            last-input-event last-command-event last-nonmenu-event
            last-event-frame
--- 146,152 ----
        (setq overriding-terminal-local-map nil)
        ;; Don't let these magic variables affect the debugger itself.
        (let ((last-command nil) this-command track-mouse
!           unread-command-events
            unread-post-input-method-events
            last-input-event last-command-event last-nonmenu-event
            last-event-frame
***************
*** 161,166 ****
--- 162,169 ----
        (unwind-protect
            (save-excursion
              (save-window-excursion
+               (with-no-warnings
+                (setq unread-command-char -1))
                (pop-to-buffer debugger-buffer)
                (debugger-mode)
                (debugger-setup-buffer debugger-args)
***************
*** 178,184 ****
                      (delete-region middlestart (point)))
                    (insert "...\n"))
                  (goto-char (point-min))
!                 (message (buffer-string))
                  (kill-emacs))
                (if (eq (car debugger-args) 'debug)
                    ;; Skip the frames for backtrace-debug, byte-code, and 
debug.
--- 181,187 ----
                      (delete-region middlestart (point)))
                    (insert "...\n"))
                  (goto-char (point-min))
!                 (message "%s" (buffer-string))
                  (kill-emacs))
                (if (eq (car debugger-args) 'debug)
                    ;; Skip the frames for backtrace-debug, byte-code, and 
debug.
***************
*** 214,220 ****
        (setq track-mouse debugger-outer-track-mouse)
        (setq last-command debugger-outer-last-command)
        (setq this-command debugger-outer-this-command)
!       (setq unread-command-char debugger-outer-unread-command-char)
        (setq unread-command-events debugger-outer-unread-command-events)
        (setq unread-post-input-method-events
            debugger-outer-unread-post-input-method-events)
--- 217,224 ----
        (setq track-mouse debugger-outer-track-mouse)
        (setq last-command debugger-outer-last-command)
        (setq this-command debugger-outer-this-command)
!       (with-no-warnings
!        (setq unread-command-char debugger-outer-unread-command-char))
        (setq unread-command-events debugger-outer-unread-command-events)
        (setq unread-post-input-method-events
            debugger-outer-unread-post-input-method-events)
***************
*** 487,493 ****
            (track-mouse debugger-outer-track-mouse)
            (last-command debugger-outer-last-command)
            (this-command debugger-outer-this-command)
-           (unread-command-char debugger-outer-unread-command-char)
            (unread-command-events debugger-outer-unread-command-events)
            (unread-post-input-method-events
             debugger-outer-unread-post-input-method-events)
--- 491,496 ----
***************
*** 500,506 ****
            (inhibit-redisplay debugger-outer-inhibit-redisplay)
            (cursor-in-echo-area debugger-outer-cursor-in-echo-area))
        (set-match-data debugger-outer-match-data)
!       (prog1 (progn ,@body)
          (setq debugger-outer-match-data (match-data))
          (setq debugger-outer-load-read-function load-read-function)
          (setq debugger-outer-overriding-terminal-local-map
--- 503,519 ----
            (inhibit-redisplay debugger-outer-inhibit-redisplay)
            (cursor-in-echo-area debugger-outer-cursor-in-echo-area))
        (set-match-data debugger-outer-match-data)
!       (prog1
!         (let ((save-ucc (with-no-warnings unread-command-char)))
!           (unwind-protect
!               (progn
!                 (with-no-warnings
!                  (setq unread-command-char 
debugger-outer-unread-command-char))
!                 (prog1 (progn ,@body)
!                   (with-no-warnings
!                    (setq debugger-outer-unread-command-char 
unread-command-char))))
!             (with-no-warnings
!              (setq unread-command-char save-ucc))))
          (setq debugger-outer-match-data (match-data))
          (setq debugger-outer-load-read-function load-read-function)
          (setq debugger-outer-overriding-terminal-local-map
***************
*** 509,515 ****
          (setq debugger-outer-track-mouse track-mouse)
          (setq debugger-outer-last-command last-command)
          (setq debugger-outer-this-command this-command)
-         (setq debugger-outer-unread-command-char unread-command-char)
          (setq debugger-outer-unread-command-events unread-command-events)
          (setq debugger-outer-unread-post-input-method-events
                unread-post-input-method-events)
--- 522,527 ----
***************
*** 721,724 ****
--- 733,737 ----
  
  (provide 'debug)
  
+ ;;; arch-tag: b6ec7047-f801-4103-9c63-d69322db9d3b
  ;;; debug.el ends here