Merge from origin/emacs-29

bd07cec844 Fix regression in Fido mode (bug#62015)
0e3c7ac13d * Fix `emacs-lisp-native-compile-and-load' for (bug#61917)
4a7e657389 * lisp/emacs-lisp/comp.el (comp-prettyformat-insn): Fix (...
8a8a994cfa Revert "Fix configuration of webp libraries"
de4277af00 Fix configuration of webp libraries
This commit is contained in:
Stefan Kangas 2023-03-07 06:30:10 +01:00
commit 8179555730
3 changed files with 19 additions and 5 deletions

View file

@ -1137,10 +1137,12 @@ with `message'. Otherwise, log with `comp-log-to-buffer'."
(comp-cstr-to-type-spec mvar)))
(defun comp-prettyformat-insn (insn)
(cl-typecase insn
(comp-mvar (comp-prettyformat-mvar insn))
(atom (prin1-to-string insn))
(cons (concat "(" (mapconcat #'comp-prettyformat-insn insn " ") ")"))))
(cond
((comp-mvar-p insn)
(comp-prettyformat-mvar insn))
((proper-list-p insn)
(concat "(" (mapconcat #'comp-prettyformat-insn insn " ") ")"))
(t (prin1-to-string insn))))
(defun comp-log-func (func verbosity)
"Log function FUNC at VERBOSITY.