summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2021-03-10 15:56:05 +0100
committerAndrea Corallo <akrl@sdf.org>2021-03-10 15:56:05 +0100
commit711b2c834976e41ca2c9c36dafcc9977eb4f398b (patch)
tree13aaba6228da874f8fd9213a5bd506b760240ba2 /lisp/loadup.el
parentfe1c081c3881421841b1e1ce4847035fdcdd457b (diff)
downloademacs-711b2c834976e41ca2c9c36dafcc9977eb4f398b.tar.gz
emacs-711b2c834976e41ca2c9c36dafcc9977eb4f398b.tar.bz2
emacs-711b2c834976e41ca2c9c36dafcc9977eb4f398b.zip
* lisp/loadup.el: Don't load pcase on native builds (bug#47025).
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 5b39152482e..f65f7f1d30a 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