From b6e2799aa1c3887c2995e115e6ff2f69d59f0e44 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Mon, 13 Feb 2023 10:26:03 +0100 Subject: [PATCH] * Some more `inhibit-native-compile' clean-up * lisp/emacs-lisp/generate-lisp-file.el (generate-lisp-file-trailer): Use `native-comp-deferred-compilation'. --- lisp/emacs-lisp/comp.el | 4 +--- lisp/emacs-lisp/generate-lisp-file.el | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 828e31c43bd..8a41989237e 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -4107,14 +4107,12 @@ the deferred compilation mechanism." data ;; So we return the compiled function. (native-elisp-load data))) - ;; We may have created a temporary file when we're being - ;; called with something other than a file as the argument. - ;; Delete it if we can. (when (and (not (stringp function-or-file)) (not output) comp-ctxt (comp-ctxt-output comp-ctxt) (file-exists-p (comp-ctxt-output comp-ctxt))) + ;; NOTE: Not sure if we want to remove this or being cautious. (cond ((eq 'windows-nt system-type) ;; We may still be using the temporary .eln file. (ignore-errors (delete-file (comp-ctxt-output comp-ctxt)))) diff --git a/lisp/emacs-lisp/generate-lisp-file.el b/lisp/emacs-lisp/generate-lisp-file.el index b2f67ab848d..167cdfbf826 100644 --- a/lisp/emacs-lisp/generate-lisp-file.el +++ b/lisp/emacs-lisp/generate-lisp-file.el @@ -103,7 +103,7 @@ if it's also byte-compiled)." (insert ";; no-byte-" "compile: t\n")) (unless autoloads (insert ";; no-update-autoloads: t\n")) - (when inhibit-native-compile + (unless native-comp-deferred-compilation (insert ";; no-native-" "compile: t\n")) (when coding (insert (format ";; coding: %s\n" -- 2.39.5