diff options
| author | Andrea Corallo | 2022-02-01 10:46:51 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2022-02-01 11:30:17 +0100 |
| commit | e7fd6fe7ecdaac26f5d352cc40ca2b2fcd923bb8 (patch) | |
| tree | ec3b42f70e255ec7c9cd42a1564cea86089bf299 | |
| parent | a92c6191b0ff8d459862386c0a1462cf29521f56 (diff) | |
| download | emacs-e7fd6fe7ecdaac26f5d352cc40ca2b2fcd923bb8.tar.gz emacs-e7fd6fe7ecdaac26f5d352cc40ca2b2fcd923bb8.zip | |
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.
| -rw-r--r-- | lisp/startup.el | 8 | ||||
| -rw-r--r-- | src/comp.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 7834e102131..aa061251717 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -519,14 +519,14 @@ DIRS are relative." | |||
| 519 | xdg-dir) | 519 | xdg-dir) |
| 520 | (t emacs-d-dir)))) | 520 | (t emacs-d-dir)))) |
| 521 | 521 | ||
| 522 | (defvar comp--loadable) | 522 | (defvar comp--compilable) |
| 523 | (defvar comp--delayed-sources) | 523 | (defvar comp--delayed-sources) |
| 524 | (defun startup--require-comp-safely () | 524 | (defun startup--require-comp-safely () |
| 525 | "Require the native compiler avoiding circular dependencies." | 525 | "Require the native compiler avoiding circular dependencies." |
| 526 | (unless (featurep 'native-compile) | 526 | (unless (featurep 'native-compile) |
| 527 | ;; Require comp with `comp--loadable' set to nil to break | 527 | ;; Require comp with `comp--compilable' set to nil to break |
| 528 | ;; circularity. | 528 | ;; circularity. |
| 529 | (let ((comp--loadable nil)) | 529 | (let ((comp--compilable nil)) |
| 530 | (require 'comp)) | 530 | (require 'comp)) |
| 531 | (native--compile-async comp--delayed-sources nil 'late) | 531 | (native--compile-async comp--delayed-sources nil 'late) |
| 532 | (setq comp--delayed-sources nil))) | 532 | (setq comp--delayed-sources nil))) |
| @@ -538,7 +538,7 @@ DIRS are relative." | |||
| 538 | (when (and (native-comp-available-p) | 538 | (when (and (native-comp-available-p) |
| 539 | comp--delayed-sources) | 539 | comp--delayed-sources) |
| 540 | (startup--require-comp-safely)) | 540 | (startup--require-comp-safely)) |
| 541 | (setq comp--loadable t)) | 541 | (setq comp--compilable t)) |
| 542 | 542 | ||
| 543 | (defvar native-comp-eln-load-path) | 543 | (defvar native-comp-eln-load-path) |
| 544 | (defun normal-top-level () | 544 | (defun normal-top-level () |
diff --git a/src/comp.c b/src/comp.c index 9342712a389..5efe026b2b2 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -5129,7 +5129,7 @@ maybe_defer_native_compilation (Lisp_Object function_name, | |||
| 5129 | 5129 | ||
| 5130 | /* This is so deferred compilation is able to compile comp | 5130 | /* This is so deferred compilation is able to compile comp |
| 5131 | dependencies breaking circularity. */ | 5131 | dependencies breaking circularity. */ |
| 5132 | if (comp__loadable) | 5132 | if (comp__compilable) |
| 5133 | { | 5133 | { |
| 5134 | /* Startup is done, comp is usable. */ | 5134 | /* Startup is done, comp is usable. */ |
| 5135 | CALL0I (startup--require-comp-safely); | 5135 | CALL0I (startup--require-comp-safely); |
| @@ -5600,9 +5600,9 @@ syms_of_comp (void) | |||
| 5600 | DEFVAR_LISP ("comp--delayed-sources", Vcomp__delayed_sources, | 5600 | DEFVAR_LISP ("comp--delayed-sources", Vcomp__delayed_sources, |
| 5601 | doc: /* List of sources to be native-compiled when startup is finished. | 5601 | doc: /* List of sources to be native-compiled when startup is finished. |
| 5602 | For internal use. */); | 5602 | For internal use. */); |
| 5603 | DEFVAR_BOOL ("comp--loadable", | 5603 | DEFVAR_BOOL ("comp--compilable", |
| 5604 | comp__loadable, | 5604 | comp__compilable, |
| 5605 | doc: /* Non-nil when comp.el can be loaded. | 5605 | doc: /* Non-nil when comp.el can be native compiled. |
| 5606 | For internal use. */); | 5606 | For internal use. */); |
| 5607 | /* Compiler control customizes. */ | 5607 | /* Compiler control customizes. */ |
| 5608 | DEFVAR_BOOL ("native-comp-deferred-compilation", | 5608 | DEFVAR_BOOL ("native-comp-deferred-compilation", |