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

[Lute Kamstra]

Index: emacs/lisp/emacs-lisp/debug.el
diff -c emacs/lisp/emacs-lisp/debug.el:1.75 emacs/lisp/emacs-lisp/debug.el:1.76
*** emacs/lisp/emacs-lisp/debug.el:1.75 Thu Mar 10 09:42:13 2005
--- emacs/lisp/emacs-lisp/debug.el      Sun Mar 13 20:53:14 2005
***************
*** 170,176 ****
            (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)
--- 170,183 ----
            (save-excursion
              (save-window-excursion
                (with-no-warnings
!                 (setq unread-command-char -1))
!               (when (eq (car debugger-args) 'debug)
!                 ;; Skip the frames for backtrace-debug, byte-code,
!                 ;; and implement-debug-on-entry.
!                 (backtrace-debug 4 t)
!                 ;; Place an extra debug-on-exit for macro's.
!                 (when (eq 'lambda (car-safe (cadr (backtrace-frame 4))))
!                   (backtrace-debug 5 t)))
                (pop-to-buffer debugger-buffer)
                (debugger-mode)
                (debugger-setup-buffer debugger-args)
***************
*** 190,199 ****
                  (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 implement-debug-on-entry.
-                   (backtrace-debug 4 t))
                (message "")
                (let ((standard-output nil)
                      (buffer-read-only t))
--- 197,202 ----
***************
*** 225,231 ****
        (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)
--- 228,234 ----
        (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)
***************
*** 263,274 ****
    ;; lambda is for debug-on-call when a function call is next.
    ;; debug is for debug-on-entry function called.
    (cond ((memq (car debugger-args) '(lambda debug))
!        (insert "--entering a function:\n")
!        (if (eq (car debugger-args) 'debug)
!            (progn
!              (delete-char 1)
!              (insert ?*)
!              (beginning-of-line))))
        ;; Exiting a function.
        ((eq (car debugger-args) 'exit)
         (insert "--returning value: ")
--- 266,272 ----
    ;; lambda is for debug-on-call when a function call is next.
    ;; debug is for debug-on-entry function called.
    (cond ((memq (car debugger-args) '(lambda debug))
!        (insert "--entering a function:\n"))
        ;; Exiting a function.
        ((eq (car debugger-args) 'exit)
         (insert "--returning value: ")
***************
*** 508,519 ****
            (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
--- 506,517 ----
            (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