procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/debug-early.el (debug-early-backtrace): Fix bug#61847

Browse source 
The `noerror` arg of `require` doesn't do what Stefan naively thought
when he wrote this code, so use `condition-case` instead.
Also check for `cl-defmethod` since `cl-prin1` can't be loaded before
that anyway.
This commit is contained in:
Stefan Monnier 2023-03-01 12:31:09 -05:00
parent 99df815c15
commit 1f1d36fa80
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/emacs-lisp/debug-early.el
View file

@ -46,10 +46,10 @@ of the build process."
(print-escape-control-characters t) (print-escape-control-characters t)
(print-escape-nonascii t) (print-escape-nonascii t)
(prin1 (if (and (fboundp 'cl-prin1) (prin1 (if (and (fboundp 'cl-prin1)
;; If we're being called while (fboundp 'cl-defmethod) ;Used by `cl-print'.
;; bootstrapping, we won't be able to load (condition-case nil
;; cl-print. (require 'cl-print)
(require 'cl-print nil t)) (error nil)))
#'cl-prin1 #'cl-prin1
#'prin1))) #'prin1)))
(mapbacktrace (mapbacktrace