Rename to inhibit-automatic-native-compilation

* src/comp.c (maybe_defer_native_compilation):
(syms_of_comp):
* lisp/subr.el (native-comp-deferred-compilation):
* lisp/startup.el (inhibit-native-compilation):
(normal-top-level):
* lisp/progmodes/elisp-mode.el (emacs-lisp-native-compile-and-load):
* lisp/emacs-lisp/comp.el (comp-trampoline-compile):
* etc/NEWS:
* doc/lispref/compile.texi (Native-Compilation Variables): Rename
inhibit-native-compilation to inhibit-automatic-native-compilation.

diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index e6e9fd1be841fdc59dc44ff4d30e976340ad98e9..7ccee08e53ae00833ddbf01a8365f3b39300dcb1 100644 (file)
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -973,7 +973,7 @@ whether native-compilation is available should use this predicate.
   This section documents the variables that control
 native-compilation.
 
-@defvar inhibit-native-compilation
+@defvar inhibit-automatic-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
@@ -987,7 +987,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 disk.
 
-You can also use the @samp{EMACS_INHIBIT_NATIVE_COMPILATION}
+You can also use the @samp{EMACS_INHIBIT_AUTOMATIC_NATIVE_COMPILATION}
 environment variable to disable native compilation.
 @end defvar
 

diff --git a/etc/NEWS b/etc/NEWS
index 9e9f9b650305d39e4552fbfcd3894bf073087b6a..dd048b9df39ea7798169b3a89021604d4f1ccced 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -171,11 +171,11 @@ time.
 ** Native Compilation
 
 +++
-*** New variable 'inhibit-native-compilation'.
+*** New variable 'inhibit-automatic-native-compilation'.
 If set, Emacs will inhibit native compilation (and won't write
 anything to the eln cache automatically).  The variable is initialised
-from the EMACS_INHIBIT_NATIVE_COMPILATION environment variable on
-Emacs startup.
+from the EMACS_INHIBIT_AUTOMATIC_NATIVE_COMPILATION environment
+variable on Emacs startup.
 
 
 --- *** New command 'native-compile-prune-cache'.  This command

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 759cedddefebfe6e39ea338428311b75ffd562da..6656b7e57c1245528a0c4fe87fe8b7977fd0e02e 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -3803,7 +3803,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-native-compilation)
+     (and (not inhibit-automatic-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 c12453e88370583dcb1e9ab1bff30c005540d128..7e7ea6aeb9e62b4d8c0acec7e55af908401ce6ae 100644 (file)
--- 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-native-compilation' set to nil to achieve asynchronous
-native compilation."
+`inhibit-automatic-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 03a67cdc0e8301760d91c93381ec1ac1a6d2b0fb..04de7e42fea22bf94bec060940ac9dcf46045468 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -541,7 +541,7 @@ DIRS are relative."
   (setq comp--compilable t))
 
 (defvar native-comp-eln-load-path)
-(defvar inhibit-native-compilation)
+(defvar inhibit-automatic-native-compilation)
 (defvar comp-enable-subr-trampolines)
 
 (defvar startup--original-eln-load-path nil
@@ -579,7 +579,8 @@ 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-native-compilation (getenv "EMACS_INHIBIT_NATIVE_COMPILATION"))
+  (setq inhibit-automatic-native-compilation
+        (getenv "EMACS_INHIBIT_AUTOMATIC_NATIVE_COMPILATION"))
 
   (if command-line-processed
       (message internal--top-level-message)
@@ -599,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-native-compilation t
+        (setq inhibit-automatic-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 0c9d94db1cc33beca569777559cdadf0dc90bb9c..51172b1cb2dd651f4fe8d7a053d5e16df44ce032 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1877,7 +1877,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-native-compilation "29.1")
+                        'inhibit-automatic-native-compilation "29.1")
 
 \f
 ;;;; Alternate names for functions - these are not being phased out.

diff --git a/src/comp.c b/src/comp.c
index ed64a850721a0c3f947f12f77cf2cee2bf13bab4..1b767ba0dd8b728127d270edddc293d42ff80663 100644 (file)
--- a/src/comp.c
+++ b/src/comp.c
@@ -5107,7 +5107,7 @@ maybe_defer_native_compilation (Lisp_Object function_name,
     return;
 
   if (!native_comp_deferred_compilation
-      || !NILP (Vinhibit_native_compilation)
+      || !NILP (Vinhibit_automatic_native_compilation)
       || noninteractive
       || !NILP (Vpurify_flag)
       || !COMPILEDP (definition)
@@ -5611,12 +5611,13 @@ For internal use.  */);
               doc: /* Non-nil when comp.el can be native compiled.
 For internal use. */);
   /* Compiler control customizes.  */
-  DEFVAR_LISP ("inhibit-native-compilation", Vinhibit_native_compilation,
+  DEFVAR_LISP ("inhibit-automatic-native-compilation",
+              Vinhibit_automatic_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_native_compilation = Qnil;
+  Vinhibit_automatic_native_compilation = Qnil;
 
   DEFVAR_BOOL ("native-comp-deferred-compilation",
               native_comp_deferred_compilation,