From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lute Kamstra Newsgroups: gmane.emacs.devel Subject: Macro handling patch for lisp/emacs-lisp/debug.el. Date: Thu, 10 Mar 2005 12:19:55 +0100 Message-ID: <87u0nju4ro.fsf@xs4all.nl> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1110456733 28866 80.91.229.2 (10 Mar 2005 12:12:13 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 10 Mar 2005 12:12:13 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 10 13:12:13 2005 Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1D9MWG-0003OY-GM for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2005 13:12:00 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1D9Ml7-0005Qd-J4 for ged-emacs-devel@m.gmane.org; Thu, 10 Mar 2005 07:27:21 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1D9M8u-0001a9-Fq for emacs-devel@gnu.org; Thu, 10 Mar 2005 06:47:52 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1D9M8q-0001Yw-Ou for emacs-devel@gnu.org; Thu, 10 Mar 2005 06:47:50 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1D9M8p-0001Pk-E1 for emacs-devel@gnu.org; Thu, 10 Mar 2005 06:47:47 -0500 Original-Received: from [194.109.24.32] (helo=smtp-vbr12.xs4all.nl) by monty-python.gnu.org with esmtp (Exim 4.34) id 1D9Lhu-0001DE-1V for emacs-devel@gnu.org; Thu, 10 Mar 2005 06:19:58 -0500 Original-Received: from pijl (a80-127-67-124.adsl.xs4all.nl [80.127.67.124]) by smtp-vbr12.xs4all.nl (8.12.11/8.12.11) with ESMTP id j2ABJtER019673 for ; Thu, 10 Mar 2005 12:19:55 +0100 (CET) (envelope-from Lute.Kamstra@xs4all.nl) Original-Received: from lute by pijl with local (Exim 3.36 #1 (Debian)) id 1D9Lhr-0001DD-00 for ; Thu, 10 Mar 2005 12:19:55 +0100 Original-To: emacs-devel@gnu.org User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) Original-Lines: 83 X-Virus-Scanned: by XS4ALL Virus Scanner X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org X-MailScanner-To: ged-emacs-devel@m.gmane.org Xref: news.gmane.org gmane.emacs.devel:34413 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:34413 Does anybody see any problems with the following patch? Lute. Index: lisp/emacs-lisp/debug.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/debug.el,v retrieving revision 1.75 diff -c -r1.75 debug.el *** lisp/emacs-lisp/debug.el 10 Mar 2005 09:42:13 -0000 1.75 --- lisp/emacs-lisp/debug.el 10 Mar 2005 11:13:23 -0000 *************** *** 171,176 **** --- 171,183 ---- (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 ---- *************** *** 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: ") Index: lisp/ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v retrieving revision 1.7081 diff -c -r1.7081 ChangeLog *** lisp/ChangeLog 10 Mar 2005 09:43:01 -0000 1.7081 --- lisp/ChangeLog 10 Mar 2005 11:13:46 -0000 *************** *** 10,15 **** --- 10,19 ---- (debug, debugger-setup-buffer): Comment update. (debugger-frame-number): Update to work with implement-debug-on-entry. + (debug): Set debug-on-exit before calling debugger-setup-buffer so + that backtrace marks the frames set to debug-on-exit and we don't + have to do it manually. Set an extra debug-on-exit for macro's. + (debugger-setup-buffer): Don't mark the top frame manually. 2005-03-10 Jay Belanger