feature/inhibit-native-comp-cleanup 8d8464bd5a 2/4: Rename native-comp-deferred-compilation into native-comp-jit-compilation

[Andrea Corallo]

branch: feature/inhibit-native-comp-cleanup
commit 8d8464bd5a98598e7a6fe63370545c7f07574926
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>

    Rename native-comp-deferred-compilation into native-comp-jit-compilation
    
            * src/comp.c (maybe_defer_native_compilation, syms_of_comp):
            Rename native-comp-deferred-compilation into
            native-comp-jit-compilation.
    
            * lisp/subr.el (native-comp-deferred-compilation): Mark
            native-comp-deferred-compilation as obsolete.
    
            * lisp/startup.el (native-comp-deferred-compilation)
            (normal-top-level): Rename native-comp-deferred-compilation into
            native-comp-jit-compilation.
    
            * lisp/progmodes/elisp-mode.el
            (emacs-lisp-native-compile-and-load): Likewise.
    
            * lisp/emacs-lisp/generate-lisp-file.el
            (generate-lisp-file-trailer): Likewise.
---
 lisp/emacs-lisp/generate-lisp-file.el | 2 +-
 lisp/progmodes/elisp-mode.el          | 2 +-
 lisp/startup.el                       | 4 ++--
 lisp/subr.el                          | 4 ++++
 src/comp.c                            | 8 ++++----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lisp/emacs-lisp/generate-lisp-file.el 
b/lisp/emacs-lisp/generate-lisp-file.el
index 167cdfbf82..d878784ba3 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"))
-    (unless native-comp-deferred-compilation
+    (unless native-comp-jit-compilation
       (insert ";; no-native-" "compile: t\n"))
     (when coding
       (insert (format ";; coding: %s\n"
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index ba1183f686..1c339d0814 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -220,7 +220,7 @@ All commands in `lisp-mode-shared-map' are inherited by 
this map."
 Load the compiled code when finished.
 
 Use `emacs-lisp-byte-compile-and-load' in combination with
-`native-comp-deferred-compilation' set to t to achieve asynchronous
+`native-comp-jit-compilation' set to t to achieve asynchronous
 native compilation."
   (interactive nil emacs-lisp-mode)
   (emacs-lisp--before-compile-buffer)
diff --git a/lisp/startup.el b/lisp/startup.el
index ddbb39df85..b0f019d704 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -542,7 +542,7 @@ DIRS are relative."
   (setq comp--compilable t))
 
 (defvar native-comp-eln-load-path)
-(defvar native-comp-deferred-compilation)
+(defvar native-comp-jit-compilation)
 (defvar native-comp-enable-subr-trampolines)
 
 (defvar startup--original-eln-load-path nil
@@ -597,7 +597,7 @@ It is the default value of the variable `top-level'."
         ;; in this session.  This is necessary if libgccjit is not
         ;; available on MS-Windows, but Emacs was built with
         ;; native-compilation support.
-        (setq native-comp-deferred-compilation nil
+        (setq native-comp-jit-compilation nil
               native-comp-enable-subr-trampolines nil))
 
       ;; Form `native-comp-eln-load-path'.
diff --git a/lisp/subr.el b/lisp/subr.el
index 56c8377da8..db33483f50 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1898,6 +1898,10 @@ instead; it will indirectly limit the specpdl stack size 
as well.")
                         'native-comp-enable-subr-trampolines
                         "29.1")
 
+(make-obsolete-variable 'native-comp-deferred-compilation
+                        'native-comp-jit-compilation
+                        "29.1")
+
 
 ;;;; Alternate names for functions - these are not being phased out.
 
diff --git a/src/comp.c b/src/comp.c
index ba3ed95bcc..019d1e78ff 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5173,7 +5173,7 @@ maybe_defer_native_compilation (Lisp_Object function_name,
   if (!load_gccjit_if_necessary (false))
     return;
 
-  if (!native_comp_deferred_compilation
+  if (!native_comp_jit_compilation
       || noninteractive
       || !NILP (Vpurify_flag)
       || !COMPILEDP (definition)
@@ -5677,13 +5677,13 @@ For internal use.  */);
               doc: /* Non-nil when comp.el can be native compiled.
 For internal use. */);
   /* Compiler control customizes.  */
-  DEFVAR_BOOL ("native-comp-deferred-compilation",
-              native_comp_deferred_compilation,
+  DEFVAR_BOOL ("native-comp-jit-compilation",
+              native_comp_jit_compilation,
               doc: /* If non-nil compile loaded .elc files asynchronously.
 
 After compilation, each function definition is updated to the native
 compiled one.  */);
-  native_comp_deferred_compilation = true;
+  native_comp_jit_compilation = true;
 
   DEFSYM (Qnative_comp_speed, "native-comp-speed");
   DEFSYM (Qnative_comp_debug, "native-comp-debug");