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

[Richard M. Stallman]

Index: emacs/lisp/emacs-lisp/debug.el
diff -c emacs/lisp/emacs-lisp/debug.el:1.52 emacs/lisp/emacs-lisp/debug.el:1.53
*** emacs/lisp/emacs-lisp/debug.el:1.52 Thu Jan 31 23:24:22 2002
--- emacs/lisp/emacs-lisp/debug.el      Wed Feb  6 10:36:41 2002
***************
*** 272,283 ****
                    (cdr debugger-args) debugger-args)
                (current-buffer))
         (insert ?\n)))
!   (when (re-search-forward "^  eval-buffer(" nil t)
!     (end-of-line)
!     (insert (format "\n  ;;; Reading at buffer position %d"
!                   (let ((level (+ (debugger-frame-number)
!                                   debugger-frame-offset -4)))
!                     (with-current-buffer (nth 2 (backtrace-frame level))
                        (point))))))
    (debugger-make-xrefs))
  
--- 272,284 ----
                    (cdr debugger-args) debugger-args)
                (current-buffer))
         (insert ?\n)))
!   ;; After any frame that uses eval-buffer,
!   ;; insert a line that states the buffer position it's reading at.
!   (save-excursion
!     (while (re-search-forward "^  eval-buffer(" nil t)
!       (end-of-line)
!       (insert (format "\n  ;;; Reading at buffer position %d"
!                     (with-current-buffer (nth 2 (backtrace-frame 
(debugger-frame-number)))
                        (point))))))
    (debugger-make-xrefs))
  
***************
*** 375,393 ****
    (prin1 debugger-value)
    (exit-recursive-edit))
  
- ;; Chosen empirically to account for all the frames
- ;; that will exist when debugger-frame is called
- ;; within the first one that appears in the backtrace buffer.
- ;; Assumes debugger-frame is called from a key;
- ;; will be wrong if it is called with Meta-x.
- (defconst debugger-frame-offset 8 "")
- 
  (defun debugger-jump ()
    "Continue to exit from this frame, with all debug-on-entry suspended."
    (interactive)
!   ;; Compensate for the two extra stack frames for debugger-jump.
!   (let ((debugger-frame-offset (+ debugger-frame-offset 2)))
!     (debugger-frame))
    ;; Turn off all debug-on-entry functions
    ;; but leave them in the list.
    (let ((list debug-function-list))
--- 376,385 ----
    (prin1 debugger-value)
    (exit-recursive-edit))
  
  (defun debugger-jump ()
    "Continue to exit from this frame, with all debug-on-entry suspended."
    (interactive)
!   (debugger-frame)
    ;; Turn off all debug-on-entry functions
    ;; but leave them in the list.
    (let ((list debug-function-list))
***************
*** 414,419 ****
--- 406,413 ----
      (beginning-of-line)
      (let ((opoint (point))
          (count 0))
+       (while (not (eq (cadr (backtrace-frame count)) 'debug))
+       (setq count (1+ count)))
        (goto-char (point-min))
        (if (or (equal (buffer-substring (point) (+ (point) 6))
                     "Signal")
***************
*** 444,451 ****
      (if (looking-at " *;;;\\|[a-z]")
        (error "This line is not a function call")))
    (beginning-of-line)
!   (let ((level (debugger-frame-number)))
!     (backtrace-debug (+ level debugger-frame-offset) t))
    (if (= (following-char) ? )
        (let ((buffer-read-only nil))
        (delete-char 1)
--- 438,444 ----
      (if (looking-at " *;;;\\|[a-z]")
        (error "This line is not a function call")))
    (beginning-of-line)
!   (backtrace-debug (debugger-frame-number) t)
    (if (= (following-char) ? )
        (let ((buffer-read-only nil))
        (delete-char 1)
***************
*** 461,468 ****
      (if (looking-at " *;;;\\|[a-z]")
        (error "This line is not a function call")))
    (beginning-of-line)
!   (let ((level (debugger-frame-number)))
!     (backtrace-debug (+ level debugger-frame-offset) nil))
    (if (= (following-char) ?*)
        (let ((buffer-read-only nil))
        (delete-char 1)
--- 454,460 ----
      (if (looking-at " *;;;\\|[a-z]")
        (error "This line is not a function call")))
    (beginning-of-line)
!   (backtrace-debug (debugger-frame-number) nil)
    (if (= (following-char) ?*)
        (let ((buffer-read-only nil))
        (delete-char 1)