[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el
From: |
Lute Kamstra |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el |
Date: |
Thu, 10 Mar 2005 04:42:14 -0500 |
Index: emacs/lisp/emacs-lisp/debug.el
diff -c emacs/lisp/emacs-lisp/debug.el:1.74 emacs/lisp/emacs-lisp/debug.el:1.75
*** emacs/lisp/emacs-lisp/debug.el:1.74 Tue Mar 8 20:15:15 2005
--- emacs/lisp/emacs-lisp/debug.el Thu Mar 10 09:42:13 2005
***************
*** 97,110 ****
This variable is used by `debugger-jump', `debugger-step-through',
and `debugger-reenable' to temporarily disable debug-on-entry.")
- ;; When you change this, you may also need to change the number of
- ;; frames that the debugger skips.
- (defconst debug-entry-code
- '(if (or inhibit-debug-on-entry debugger-jumping-flag)
- nil
- (debug 'debug))
- "Code added to a function to cause it to call the debugger upon entry.")
-
;;;###autoload
(setq debugger 'debug)
;;;###autoload
--- 97,102 ----
***************
*** 200,206 ****
(kill-emacs))
(if (eq (car debugger-args) 'debug)
;; Skip the frames for backtrace-debug, byte-code,
! ;; and debug-entry-code.
(backtrace-debug 4 t))
(message "")
(let ((standard-output nil)
--- 192,198 ----
(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)
***************
*** 264,270 ****
(progn
(search-forward "\n debug(")
(forward-line (if (eq (car debugger-args) 'debug)
! 2 ; Remove debug-entry-code frame.
1))
(point)))
(insert "Debugger entered")
--- 256,262 ----
(progn
(search-forward "\n debug(")
(forward-line (if (eq (car debugger-args) 'debug)
! 2 ; Remove implement-debug-on-entry frame.
1))
(point)))
(insert "Debugger entered")
***************
*** 432,439 ****
(count 0))
(while (not (eq (cadr (backtrace-frame count)) 'debug))
(setq count (1+ count)))
! ;; Skip debug-entry-code frame.
! (when (member '(debug (quote debug)) (cdr (backtrace-frame (1+ count))))
(setq count (1+ count)))
(goto-char (point-min))
(when (looking-at "Debugger entered--\\(Lisp error\\|returning
value\\):")
--- 424,431 ----
(count 0))
(while (not (eq (cadr (backtrace-frame count)) 'debug))
(setq count (1+ count)))
! ;; Skip implement-debug-on-entry frame.
! (when (eq 'implement-debug-on-entry (cadr (backtrace-frame (1+ count))))
(setq count (1+ count)))
(goto-char (point-min))
(when (looking-at "Debugger entered--\\(Lisp error\\|returning
value\\):")
***************
*** 623,628 ****
--- 615,630 ----
(use-local-map debugger-mode-map)
(run-mode-hooks 'debugger-mode-hook))
+ ;; When you change this, you may also need to change the number of
+ ;; frames that the debugger skips.
+ (defun implement-debug-on-entry ()
+ "Conditionally call the debugger.
+ A call to this function is inserted by `debug-on-entry' to cause
+ functions to break on entry."
+ (if (or inhibit-debug-on-entry debugger-jumping-flag)
+ nil
+ (funcall debugger 'debug)))
+
;;;###autoload
(defun debug-on-entry (function)
"Request FUNCTION to invoke debugger each time it is called.
***************
*** 647,653 ****
(debug-convert-byte-code function))
(or (consp (symbol-function function))
(error "Definition of %s is not a list" function))
! (fset function (debug-on-entry-1 function (symbol-function function) t))
(or (memq function debug-function-list)
(push function debug-function-list))
function)
--- 649,655 ----
(debug-convert-byte-code function))
(or (consp (symbol-function function))
(error "Definition of %s is not a list" function))
! (fset function (debug-on-entry-1 function t))
(or (memq function debug-function-list)
(push function debug-function-list))
function)
***************
*** 664,670 ****
(if name (intern name)))))
(if (and function (not (string= function "")))
(progn
! (let ((f (debug-on-entry-1 function (symbol-function function) nil)))
(condition-case nil
(if (and (equal (nth 1 f) '(&rest debug-on-entry-args))
(eq (car (nth 3 f)) 'apply))
--- 666,672 ----
(if name (intern name)))))
(if (and function (not (string= function "")))
(progn
! (let ((f (debug-on-entry-1 function nil)))
(condition-case nil
(if (and (equal (nth 1 f) '(&rest debug-on-entry-args))
(eq (car (nth 3 f)) 'apply))
***************
*** 695,702 ****
(setq body (cons (documentation function) body)))
(fset function (cons 'lambda (cons (car contents) body)))))))
! (defun debug-on-entry-1 (function defn flag)
! (let ((tail defn))
(if (subrp tail)
(error "%s is a built-in function" function)
(if (eq (car tail) 'macro) (setq tail (cdr tail)))
--- 697,705 ----
(setq body (cons (documentation function) body)))
(fset function (cons 'lambda (cons (car contents) body)))))))
! (defun debug-on-entry-1 (function flag)
! (let* ((defn (symbol-function function))
! (tail defn))
(if (subrp tail)
(error "%s is a built-in function" function)
(if (eq (car tail) 'macro) (setq tail (cdr tail)))
***************
*** 708,717 ****
;; Skip the interactive form.
(when (eq 'interactive (car-safe (cadr tail)))
(setq tail (cdr tail)))
! (unless (eq flag (equal (cadr tail) debug-entry-code))
;; Add/remove debug statement as needed.
(if flag
! (setcdr tail (cons debug-entry-code (cdr tail)))
(setcdr tail (cddr tail))))
defn)))
--- 711,720 ----
;; Skip the interactive form.
(when (eq 'interactive (car-safe (cadr tail)))
(setq tail (cdr tail)))
! (unless (eq flag (equal (cadr tail) '(implement-debug-on-entry)))
;; Add/remove debug statement as needed.
(if flag
! (setcdr tail (cons '(implement-debug-on-entry) (cdr tail)))
(setcdr tail (cddr tail))))
defn)))
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Lute Kamstra, 2005/03/01
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Lute Kamstra, 2005/03/01
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Lute Kamstra, 2005/03/03
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Lute Kamstra, 2005/03/04
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Stefan Monnier, 2005/03/07
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Lute Kamstra, 2005/03/08
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el,
Lute Kamstra <=
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Lute Kamstra, 2005/03/13
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Lute Kamstra, 2005/03/14
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Stefan Monnier, 2005/03/26
- [Emacs-diffs] Changes to emacs/lisp/emacs-lisp/debug.el, Lute Kamstra, 2005/03/29