master e7fd6fe7ec 2/2: Rename `comp--loadable' into `comp--compilable'

[Andrea Corallo]

branch: master
commit e7fd6fe7ecdaac26f5d352cc40ca2b2fcd923bb8
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>

    Rename `comp--loadable' into `comp--compilable'
    
    * lisp/startup.el (comp--compilable): Rename from `comp--loadable'.
    (startup--require-comp-safely): Update accordingly.
    (startup--honor-delayed-native-compilations): Likewise.
    * src/comp.c (syms_of_comp): Update.
    (maybe_defer_native_compilation): Likewise.
---
 lisp/startup.el | 8 ++++----
 src/comp.c      | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index 7834e10213..aa06125171 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -519,14 +519,14 @@ DIRS are relative."
       xdg-dir)
      (t emacs-d-dir))))
 
-(defvar comp--loadable)
+(defvar comp--compilable)
 (defvar comp--delayed-sources)
 (defun startup--require-comp-safely ()
   "Require the native compiler avoiding circular dependencies."
   (unless (featurep 'native-compile)
-    ;; Require comp with `comp--loadable' set to nil to break
+    ;; Require comp with `comp--compilable' set to nil to break
     ;; circularity.
-    (let ((comp--loadable nil))
+    (let ((comp--compilable nil))
       (require 'comp))
     (native--compile-async comp--delayed-sources nil 'late)
     (setq comp--delayed-sources nil)))
@@ -538,7 +538,7 @@ DIRS are relative."
   (when (and (native-comp-available-p)
              comp--delayed-sources)
     (startup--require-comp-safely))
-  (setq comp--loadable t))
+  (setq comp--compilable t))
 
 (defvar native-comp-eln-load-path)
 (defun normal-top-level ()
diff --git a/src/comp.c b/src/comp.c
index 9342712a38..5efe026b2b 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -5129,7 +5129,7 @@ maybe_defer_native_compilation (Lisp_Object function_name,
 
   /* This is so deferred compilation is able to compile comp
      dependencies breaking circularity.  */
-  if (comp__loadable)
+  if (comp__compilable)
     {
       /* Startup is done, comp is usable.  */
       CALL0I (startup--require-comp-safely);
@@ -5600,9 +5600,9 @@ syms_of_comp (void)
   DEFVAR_LISP ("comp--delayed-sources", Vcomp__delayed_sources,
               doc: /* List of sources to be native-compiled when startup is 
finished.
 For internal use.  */);
-  DEFVAR_BOOL ("comp--loadable",
-              comp__loadable,
-              doc: /* Non-nil when comp.el can be loaded.
+  DEFVAR_BOOL ("comp--compilable",
+              comp__compilable,
+              doc: /* Non-nil when comp.el can be native compiled.
 For internal use. */);
   /* Compiler control customizes.  */
   DEFVAR_BOOL ("native-comp-deferred-compilation",