diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-05-06 21:47:23 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-05-06 21:47:23 +0900 |
| commit | ff3d7190bbaebf196c0ac7f84d4869fa9362276f (patch) | |
| tree | e00d8dd9815703e4081abb7d5a3efae52d1a6eb0 /lisp/loadup.el | |
| parent | 5b97b98daa7f61311c3662beecbeca7037505992 (diff) | |
| parent | 896384b542cabdc000eafb80c9082830f692bbb2 (diff) | |
| download | emacs-ff3d7190bbaebf196c0ac7f84d4869fa9362276f.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index c3b2da2a07f..dbc3ab79def 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -456,7 +456,7 @@ lost after dumping"))) ;; At this point, we're ready to resume undo recording for scratch. (buffer-enable-undo "*scratch*") -(when (featurep 'nativecomp) +(when (featurep 'native-compile) ;; Fix the compilation unit filename to have it working when ;; installed or if the source directory got moved. This is set to be ;; a pair in the form of: @@ -528,7 +528,7 @@ lost after dumping"))) ((equal dump-mode "bootstrap") "emacs") ((equal dump-mode "pbootstrap") "bootstrap-emacs.pdmp") (t (error "unrecognized dump mode %s" dump-mode))))) - (when (and (featurep 'nativecomp) + (when (and (featurep 'native-compile) (equal dump-mode "pdump")) ;; Don't enable this before bootstrap is completed, as the ;; compiler infrastructure may not be usable yet. |