]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/emacs-lisp/pcase.el (pcase--subtype-bitsets): Fix bootstrap failure
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 22 May 2024 17:27:50 +0000 (13:27 -0400)
committerEshel Yaron <me@eshelyaron.com>
Thu, 23 May 2024 08:30:09 +0000 (10:30 +0200)
`rm lisp/emacs-lisp/cl-preloaded.elc src/bootstrap-emacs`
followed by `make` ended up loading right after defining
`built-in-class-p` but before actually defining the
built-in-classes so the computation of bitsets failed.

(cherry picked from commit d8af7c99bb0d98ab1b246cc5d8a1c5567c379d74)

lisp/emacs-lisp/pcase.el

index 23f1bac600cdeb933d76bf117c44d5b4ebd885f7..1a58c60734a088919290c3c4916c7ac81a1af496 100644 (file)
@@ -678,7 +678,8 @@ recording whether the var has been referenced by earlier parts of the match."
       bitsets)))
 
 (defconst pcase--subtype-bitsets
-  (if (fboundp 'built-in-class-p)
+  (if (and (fboundp 'built-in-class-p)
+           (built-in-class-p (get 'function 'cl--class)))
       (pcase--subtype-bitsets)
     ;; Early bootstrap: we don't have the built-in classes yet, so just
     ;; use an empty table for now.