]> git.eshelyaron.com Git - emacs.git/commitdiff
* lisp/loadup.el: Don't load pcase on native builds (bug#47025).
authorAndrea Corallo <akrl@sdf.org>
Wed, 10 Mar 2021 14:56:05 +0000 (15:56 +0100)
committerAndrea Corallo <akrl@sdf.org>
Wed, 10 Mar 2021 14:56:05 +0000 (15:56 +0100)
lisp/loadup.el

index 5b39152482efc0d5c2a26ab8a921269c3af6ecd0..f65f7f1d30a91d87242a03eb23991fecd6326f9d 100644 (file)
 ;; 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