Re: [Emacs-commit] emacs/lisp/emacs-lisp debug.el

[Lute Kamstra]

Hello Stefan,

> CVSROOT:      /cvsroot/emacs
> Module name:  emacs
> Branch:       
> Changes by:   Stefan Monnier <address@hidden> 05/02/28 14:33:50
>
> Modified files:
>       lisp/emacs-lisp: debug.el 
>
> Log message:
>       (inhibit-debug-on-entry): New var.
>       (debug): Use it.  Move the inhibit-trace earlier.
>       (debug-entry-code): New const.
>       (debug-on-entry-1): Use it.
>
> CVSWeb URLs:
> http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/emacs-lisp/debug.el.diff?tr1=1.67&tr2=1.68&r1=text&r2=text

What about this patch to complete your change?  Could you also commit
a ChangeLog entry?

Regards,

  Lute.


*** lisp/emacs-lisp/debug.el    28 Feb 2005 14:33:50 -0000      1.68
--- lisp/emacs-lisp/debug.el    28 Feb 2005 18:32:00 -0000
***************
*** 189,196 ****
                  (message "%s" (buffer-string))
                  (kill-emacs))
                (if (eq (car debugger-args) 'debug)
!                   ;; Skip the frames for backtrace-debug, byte-code, and 
debug.
!                   (backtrace-debug 3 t))
                (debugger-reenable)
                (message "")
                (let ((standard-output nil)
--- 189,197 ----
                  (message "%s" (buffer-string))
                  (kill-emacs))
                (if (eq (car debugger-args) 'debug)
!                   ;; Skip the frames for backtrace-debug, byte-code,
!                   ;; and debug-entry-code.
!                   (backtrace-debug 4 t))
                (debugger-reenable)
                (message "")
                (let ((standard-output nil)
***************
*** 253,259 ****
    (delete-region (point)
                 (progn
                   (search-forward "\n  debug(")
!                  (forward-line 1)
                   (point)))
    (insert "Debugger entered")
    ;; lambda is for debug-on-call when a function call is next.
--- 254,262 ----
    (delete-region (point)
                 (progn
                   (search-forward "\n  debug(")
!                  (forward-line (if (eq (car debugger-args) 'debug)
!                                    2
!                                  1))
                   (point)))
    (insert "Debugger entered")
    ;; lambda is for debug-on-call when a function call is next.
***************
*** 694,700 ****
              (setq body (cons (documentation function) body)))
          (fset function (cons 'lambda (cons (car contents) body)))))))
  
! 
  (defconst debug-entry-code '(if inhibit-debug-on-entry nil (debug 'debug))
    "Code added to a function to cause it to call the debugger upon entry.")
  
--- 697,704 ----
              (setq body (cons (documentation function) body)))
          (fset function (cons 'lambda (cons (car contents) body)))))))
  
! ;; When you change this, you may also need to change the number of
! ;; frames that the debugger skips.
  (defconst debug-entry-code '(if inhibit-debug-on-entry nil (debug 'debug))
    "Code added to a function to cause it to call the debugger upon entry.")