cwebber pushed a commit to branch wip-elisp-rebased
in repository guile.
commit 27adf0806137a7d2a82eb04dc498d772115f1708
Author: Ricardo Wurmus <[email protected]>
AuthorDate: Tue May 19 00:16:10 2020 +0200
elisp: boot: Replace removed FRAME-PROCEDURE with FRAME-PROCEDURE-NAME.
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)
---
module/language/elisp/boot.el | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/module/language/elisp/boot.el b/module/language/elisp/boot.el
index c0cfb03..70af251 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)))
