diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2020-05-19 00:16:10 +0200 |
|---|---|---|
| committer | Christine Lemmer-Webber <cwebber@dustycloud.org> | 2021-10-19 18:10:05 -0400 |
| commit | 4b9b8277733729f5b825f78fadfead9fc3630e7e (patch) | |
| tree | e95fa2b940c6574de7ca671d291c080389b2d1bd | |
| parent | 726f34b35ddd60ca18cc716621029bfb560eb50e (diff) | |
| download | guile-wip-elisp-rebased.tar.gz | |
elisp: boot: Replace removed FRAME-PROCEDURE with FRAME-PROCEDURE-NAME.wip-elisp-rebased
This is a follow-up to commit e139accb530c970c989b3d53d5a8a22fd75437fc.
* module/language/elisp/boot.el (backtrace-frame, guile-backtrace): Use
FRAME-PROCEDURE-NAME instead of FRAME-PROCEDURE.
(cherry picked from commit 3d7db7c2175d91629d4133ae0b79f3c9c2ce6191)
| -rw-r--r-- | module/language/elisp/boot.el | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/module/language/elisp/boot.el b/module/language/elisp/boot.el index c0cfb03cd..70af251c4 100644 --- a/module/language/elisp/boot.el +++ b/module/language/elisp/boot.el @@ -760,10 +760,7 @@ (defun backtrace-frame (nframes) (let* ((stack (funcall (@ (guile) make-stack) t)) (frame (stack-ref stack nframes)) - (proc (funcall (@ (guile) frame-procedure) frame)) - (pname (or (and (%functionp proc) - (funcall (@ (guile) procedure-name) proc)) - proc)) + (pname (funcall (@ (guile) frame-procedure-name) frame)) (args (funcall (@ (guile) frame-arguments) frame))) (cons t (cons pname args)))) @@ -774,10 +771,7 @@ (space (funcall (@ (guile) integer->char) 32))) (while frame (princ (string 32 32)) - (let ((proc (funcall (@ (guile) frame-procedure) frame))) - (prin1 (or (and (%functionp proc) - (funcall (@ (guile) procedure-name) proc)) - proc))) + (prin1 (funcall (@ (guile) frame-procedure-name) frame)) (prin1 (funcall (@ (guile) frame-arguments) frame)) (terpri) (setq frame (funcall (@ (guile) frame-previous) frame))) |