[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 711b2c8 2/2: * lisp/loadup.el: Don't load pcase on n
|
From: |
Andrea Corallo |
|
Subject: |
feature/native-comp 711b2c8 2/2: * lisp/loadup.el: Don't load pcase on native builds (bug#47025). |
|
Date: |
Wed, 10 Mar 2021 10:17:55 -0500 (EST) |
branch: feature/native-comp
commit 711b2c834976e41ca2c9c36dafcc9977eb4f398b
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
* lisp/loadup.el: Don't load pcase on native builds (bug#47025).
---
lisp/loadup.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 5b39152..f65f7f1 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -157,7 +157,8 @@
;; Load-time macro-expansion can only take effect after setting
;; load-source-file-function because of where it is called in lread.c.
(load "emacs-lisp/macroexp")
-(if (byte-code-function-p (symbol-function 'macroexpand-all))
+(if (or (byte-code-function-p (symbol-function 'macroexpand-all))
+ (subr-native-elisp-p (symbol-function 'macroexpand-all)))
nil
;; Since loaddefs is not yet loaded, macroexp's uses of pcase will simply
;; fail until pcase is explicitly loaded. This also means that we have to