From: Gemini Lasswell <gazally@runbox.com>
To: Keith David Bershatsky <esq@lawlist.com>
Cc: 25393@debbugs.gnu.org, "Clément Pit-Claudel" <cpitclaudel@gmail.com>
Subject: bug#25393: FEATURE REQUEST: *Backtrace* -- C source code def highlight + jump to def.
Date: Wed, 08 Aug 2018 17:11:21 -0700 [thread overview]
Message-ID: <87sh3oe6vq.fsf@runbox.com> (raw)
In-Reply-To: <m2wpe6ymxy.wl%esq@lawlist.com> (Keith David Bershatsky's message of "Sun, 08 Jan 2017 00:29:13 -0800")
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
Hi Keith,
The new backtrace mode, in the master branch as of da0054c307, makes
links for built-in functions.
The attached patch improves on current master by making links to C
functions work even when those functions are advised. See
http://lists.gnu.org/archive/html/emacs-devel/2018-08/msg00025.html for
Clément's report of that problem.
[-- Attachment #2: 0001-Fix-links-in-backtraces-to-work-on-advised-built-ins.patch --]
[-- Type: text/plain, Size: 2401 bytes --]
From 7737f48840d3c07b09506eb4b4743646d27cd2aa Mon Sep 17 00:00:00 2001
From: Gemini Lasswell <gazally@runbox.com>
Date: Tue, 7 Aug 2018 19:39:06 -0700
Subject: [PATCH] Fix links in backtraces to work on advised built-ins
(Bug#25393)
* lisp/emacs-lisp/backtrace.el (backtrace--print-func-and-args): Make
links to the original definition of advised functions. Handle the
case when the function slot of the backtrace frame contains the
definition of a built-in function.
---
lisp/emacs-lisp/backtrace.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lisp/emacs-lisp/backtrace.el b/lisp/emacs-lisp/backtrace.el
index f13b43b465..e82d4f5a5a 100644
--- a/lisp/emacs-lisp/backtrace.el
+++ b/lisp/emacs-lisp/backtrace.el
@@ -34,6 +34,7 @@
(eval-when-compile (require 'cl-lib))
(eval-when-compile (require 'pcase))
(eval-when-compile (require 'subr-x)) ; if-let
+(require 'find-func)
(require 'help-mode) ; Define `help-function-def' button type.
(require 'lisp-mode)
@@ -735,11 +736,11 @@ backtrace--print-func-and-args
(evald (backtrace-frame-evald frame))
(fun (backtrace-frame-fun frame))
(args (backtrace-frame-args frame))
- (def (and (symbolp fun) (fboundp fun) (symbol-function fun)))
+ (def (find-function-advised-original fun))
(fun-file (or (symbol-file fun 'defun)
- (and (subrp def)
- (not (eq 'unevalled (cdr (subr-arity def))))
- (find-lisp-object-file-name fun def))))
+ (and (subrp def)
+ (not (eq 'unevalled (cdr (subr-arity def))))
+ (find-lisp-object-file-name fun def))))
(fun-pt (point)))
(cond
((and evald (not debugger-stack-frame-as-list))
@@ -762,7 +763,8 @@ backtrace--print-func-and-args
(insert (backtrace--print-to-string fun-and-args)))
(cl-incf fun-pt)))
(when fun-file
- (make-text-button fun-pt (+ fun-pt (length (symbol-name fun)))
+ (make-text-button fun-pt (+ fun-pt
+ (length (backtrace--print-to-string fun)))
:type 'help-function-def
'help-args (list fun fun-file)))
;; After any frame that uses eval-buffer, insert a comment that
--
2.16.4
[-- Attachment #3: Type: text/plain, Size: 610 bytes --]
Keith David Bershatsky <esq@lawlist.com> writes:
> A check should probably be included to see whether the
> `find-function-C-source-directory' contains C source code files before
> creating highlighting/buttons for jumping:
I chose not to do this. I think it's better to make the buttons
and give an error message when they are pressed if
'find-function-C-source-directory' is misconfigured, because then the
error message lets the user know that there is a configuration problem
so that she or he can try to fix it.
Let me know if you are able to give this a try and how it works for you.
Thanks,
Gemini
next prev parent reply other threads:[~2018-08-09 0:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-08 8:29 bug#25393: FEATURE REQUEST: *Backtrace* -- C source code def highlight + jump to def Keith David Bershatsky
2018-08-09 0:11 ` Gemini Lasswell [this message]
2018-08-27 18:07 ` Gemini Lasswell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sh3oe6vq.fsf@runbox.com \
--to=gazally@runbox.com \
--cc=25393@debbugs.gnu.org \
--cc=cpitclaudel@gmail.com \
--cc=esq@lawlist.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.