diff options
| author | Dmitry Gutov | 2022-08-15 02:22:59 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2022-08-15 02:22:59 +0300 |
| commit | ee3a674c7c9e39fe7ff296ce1f9830fc45520de8 (patch) | |
| tree | e8ba1e7be54314f208454e80e3d31044c913f3eb /lisp/loadup.el | |
| parent | fe0e53d963899a16e0dd1bbc1ba10a6b59f7989e (diff) | |
| parent | 0a8e88fd83db5398d36064a7f87cff5b57da7284 (diff) | |
| download | emacs-scratch/font_lock_large_files.tar.gz emacs-scratch/font_lock_large_files.zip | |
Merge branch 'master' into scratch/font_lock_large_filesscratch/font_lock_large_files
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 8dad382ac0d..17e82cc0c49 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el | |||
| @@ -154,8 +154,7 @@ | |||
| 154 | ;; Load-time macro-expansion can only take effect after setting | 154 | ;; Load-time macro-expansion can only take effect after setting |
| 155 | ;; load-source-file-function because of where it is called in lread.c. | 155 | ;; load-source-file-function because of where it is called in lread.c. |
| 156 | (load "emacs-lisp/macroexp") | 156 | (load "emacs-lisp/macroexp") |
| 157 | (if (or (byte-code-function-p (symbol-function 'macroexpand-all)) | 157 | (if (compiled-function-p (symbol-function 'macroexpand-all)) |
| 158 | (subr-native-elisp-p (symbol-function 'macroexpand-all))) | ||
| 159 | nil | 158 | nil |
| 160 | ;; Since loaddefs is not yet loaded, macroexp's uses of pcase will simply | 159 | ;; Since loaddefs is not yet loaded, macroexp's uses of pcase will simply |
| 161 | ;; fail until pcase is explicitly loaded. This also means that we have to | 160 | ;; fail until pcase is explicitly loaded. This also means that we have to |