diff options
author | Philip Kaludercic <philipk@posteo.net> | 2022-08-18 09:23:45 +0200 |
---|---|---|
committer | Philip Kaludercic <philipk@posteo.net> | 2022-08-18 09:23:45 +0200 |
commit | d3f03666bbd6c506d65650c33413df826f502065 (patch) | |
tree | 52c932f10280cc9a63a4cebb2a673b5e49a5a0d2 /lisp/emacs-lisp/macroexp.el | |
parent | 57e16b316d76b77de4252b7923eab8199b8c3fd5 (diff) | |
parent | 9f26a8d31b1c7e6a596ca0933f327df5ac60463d (diff) | |
download | emacs-d3f03666bbd6c506d65650c33413df826f502065.tar.gz emacs-d3f03666bbd6c506d65650c33413df826f502065.tar.bz2 emacs-d3f03666bbd6c506d65650c33413df826f502065.zip |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'lisp/emacs-lisp/macroexp.el')
-rw-r--r-- | lisp/emacs-lisp/macroexp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 6a193a56d2d..5ae9d8368f0 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -823,7 +823,7 @@ test of free variables in the following ways: (eval-when-compile (add-hook 'emacs-startup-hook (lambda () - (and (not (byte-code-function-p + (and (not (compiled-function-p (symbol-function 'macroexpand-all))) (locate-library "macroexp.elc") (load "macroexp.elc"))))) |