From: Po Lu <luangruo@yahoo.com>
Date: Tue, 29 Mar 2022 05:58:40 +0000 (+0800)
Subject: Temporarily fix the oclosure bootstrap
X-Git-Tag: emacs-29.0.90~1931^2~877
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55932a65ed719d4277e0e781ca5e323b189d7f63;p=emacs.git

Temporarily fix the oclosure bootstrap

* lisp/emacs-lisp/oclosure.el (oclosure-define): Load oclosure
from source if `oclosure--define' is not defined during byte
compilation.
---

diff --git a/lisp/emacs-lisp/oclosure.el b/lisp/emacs-lisp/oclosure.el
index 3d17c6c668c..0c504e5d821 100644
--- a/lisp/emacs-lisp/oclosure.el
+++ b/lisp/emacs-lisp/oclosure.el
@@ -248,6 +248,8 @@ list of slot properties.  The currently known properties are the following:
        ,(when options (macroexp-warn-and-return name
                        (format "Ignored options: %S" options)
                        nil))
+       (eval-when-compile (unless (fboundp 'oclosure--define)
+                            (load "oclosure.el")))
        (eval-and-compile
          (oclosure--define ',name ,docstring ',parent-names ',slots
                            ,@(when predicate `(:predicate ',predicate))))