Revert "Rename to inhibit-automatic-native-compilation"

This reverts commit f97993ee667f9be7589825f3a4fbc095d6944ec6.

7 files changed, 17 insertions, 18 deletions

diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index be2125a9ab3..8bb079b65df 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -981,7 +981,7 @@ whether native-compilation is available should use this predicate.
   This section documents the variables that control
 native-compilation.
 
-@defvar inhibit-automatic-native-compilation
+@defvar inhibit-native-compilation
 If your Emacs has support for native compilation, Emacs will (by
 default) compile the Lisp files you're loading in the background, and
 then install the native-compiled versions of the functions.  If you
@@ -995,7 +995,7 @@ files, the compiler may still be invoked to install @dfn{trampolines}
 if any built-in functions are redefined.  However, these trampolines
 will not get written to your cache directory.
 
-You can also use the @samp{EMACS_INHIBIT_AUTOMATIC_NATIVE_COMPILATION}
+You can also use the @samp{EMACS_INHIBIT_NATIVE_COMPILATION}
 environment variable to disable native compilation.
 @end defvar
 
diff --git a/etc/NEWS b/etc/NEWS
index 2d15e39036a..5ce18872f1a 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -199,11 +199,12 @@ load time.
 ** Native Compilation
 
 +++
-*** New variable 'inhibit-automatic-native-compilation'.
+*** New variable 'inhibit-native-compilation'.
 If set, Emacs will inhibit native compilation (and won't write
-anything to the eln cache automatically).  The variable is initialized
-during Emacs startup from the environment variable
-'EMACS_INHIBIT_AUTOMATIC_NATIVE_COMPILATION'.
+anything to the eln cache automatically).  The variable is initialised
+from the EMACS_INHIBIT_NATIVE_COMPILATION environment variable on
+Emacs startup.
+
 
 ---
 *** New command 'native-compile-prune-cache'.
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 7ba8e956fb2..ab6c8a8ea90 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -3805,7 +3805,7 @@ Return the trampoline if found or nil otherwise."
      form nil
      ;; If we've disabled nativecomp, don't write the trampolines to
      ;; the eln cache (but create them).
-     (and (not inhibit-automatic-native-compilation)
+     (and (not inhibit-native-compilation)
           (cl-loop
            for dir in (if native-compile-target-directory
                           (list (expand-file-name comp-native-version-dir
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index be969b0c3e3..7ba2c38cb75 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -220,8 +220,8 @@ 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
-`inhibit-automatic-native-compilation' set to nil to achieve
-asynchronous native compilation."
+`inhibit-native-compilation' set to nil to achieve asynchronous
+native compilation."
   (interactive nil emacs-lisp-mode)
   (emacs-lisp--before-compile-buffer)
   (load (native-compile buffer-file-name)))
diff --git a/lisp/startup.el b/lisp/startup.el
index e5ec15eebea..b0a8eed9d38 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 inhibit-automatic-native-compilation)
+(defvar inhibit-native-compilation)
 (defvar comp-enable-subr-trampolines)
 
 (defvar startup--original-eln-load-path nil
@@ -580,8 +580,7 @@ It sets `command-line-processed', processes the command-line,
 reads the initialization files, etc.
 It is the default value of the variable `top-level'."
   ;; Allow disabling automatic .elc->.eln processing.
-  (setq inhibit-automatic-native-compilation
-        (getenv "EMACS_INHIBIT_AUTOMATIC_NATIVE_COMPILATION"))
+  (setq inhibit-native-compilation (getenv "EMACS_INHIBIT_NATIVE_COMPILATION"))
 
   (if command-line-processed
       (message internal--top-level-message)
@@ -601,7 +600,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 inhibit-automatic-native-compilation t
+        (setq inhibit-native-compilation t
               comp-enable-subr-trampolines nil))
 
       ;; Form `native-comp-eln-load-path'.
diff --git a/lisp/subr.el b/lisp/subr.el
index 9e6388987df..6282abc1b16 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1895,7 +1895,7 @@ instead; it will indirectly limit the specpdl stack size as well.")
 (make-obsolete-variable 'max-specpdl-size nil "29.1")
 
 (make-obsolete-variable 'native-comp-deferred-compilation
-                        'inhibit-automatic-native-compilation "29.1")
+                        'inhibit-native-compilation "29.1")
 
 
 ;;;; Alternate names for functions - these are not being phased out.
diff --git a/src/comp.c b/src/comp.c
index 10cf7962ba1..88b871aaae8 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5174,7 +5174,7 @@ maybe_defer_native_compilation (Lisp_Object function_name,
     return;
 
   if (!native_comp_deferred_compilation
-      || !NILP (Vinhibit_automatic_native_compilation)
+      || !NILP (Vinhibit_native_compilation)
       || noninteractive
       || !NILP (Vpurify_flag)
       || !COMPILEDP (definition)
@@ -5678,13 +5678,12 @@ For internal use.  */);
 	       doc: /* Non-nil when comp.el can be native compiled.
 For internal use. */);
   /* Compiler control customizes.  */
-  DEFVAR_LISP ("inhibit-automatic-native-compilation",
-	       Vinhibit_automatic_native_compilation,
+  DEFVAR_LISP ("inhibit-native-compilation", Vinhibit_native_compilation,
 	       doc: /* If non-nil, inhibit automatic native compilation of loaded .elc files.
 
 After compilation, each function definition is updated to the native
 compiled one.  */);
-  Vinhibit_automatic_native_compilation = Qnil;
+  Vinhibit_native_compilation = Qnil;
 
   DEFVAR_BOOL ("native-comp-deferred-compilation",
 	       native_comp_deferred_compilation,