diff options
| author | Eli Zaretskii | 2022-01-28 09:37:28 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2022-01-28 09:37:28 +0200 |
| commit | b293e254ebe1eaaa3b1866d319c8ee8973e6c2ea (patch) | |
| tree | b732d3ad2fb448774e39a3fa2439212bc12b080d | |
| parent | 241f2857f1ce3732102ba77a98727406fb93edb0 (diff) | |
| download | emacs-b293e254ebe1eaaa3b1866d319c8ee8973e6c2ea.tar.gz emacs-b293e254ebe1eaaa3b1866d319c8ee8973e6c2ea.zip | |
; Rename 'startup--require-comp-safetly'
* src/comp.c (maybe_defer_native_compilation):
* lisp/startup.el (startup--require-comp-safely): Rename from
'startup--require-comp-safetly'. All callers changed.
| -rw-r--r-- | lisp/startup.el | 4 | ||||
| -rw-r--r-- | src/comp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index f4216f7c4cb..60aaa76002f 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -521,7 +521,7 @@ DIRS are relative." | |||
| 521 | 521 | ||
| 522 | (defvar comp--loadable) | 522 | (defvar comp--loadable) |
| 523 | (defvar comp--delayed-sources) | 523 | (defvar comp--delayed-sources) |
| 524 | (defun startup--require-comp-safetly () | 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 'comp) | 526 | (unless (featurep 'comp) |
| 527 | ;; Require comp with `comp--loadable' set to nil to break | 527 | ;; Require comp with `comp--loadable' set to nil to break |
| @@ -537,7 +537,7 @@ DIRS are relative." | |||
| 537 | "Honor pending delayed deferred native compilations." | 537 | "Honor pending delayed deferred native compilations." |
| 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-safetly)) | 540 | (startup--require-comp-safely)) |
| 541 | (setq comp--loadable t)) | 541 | (setq comp--loadable t)) |
| 542 | 542 | ||
| 543 | (defvar native-comp-eln-load-path) | 543 | (defvar native-comp-eln-load-path) |
diff --git a/src/comp.c b/src/comp.c index 66288988fd8..56e583eb5c8 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -5132,7 +5132,7 @@ maybe_defer_native_compilation (Lisp_Object function_name, | |||
| 5132 | if (comp__loadable) | 5132 | if (comp__loadable) |
| 5133 | { | 5133 | { |
| 5134 | /* Startup is done, comp is usable. */ | 5134 | /* Startup is done, comp is usable. */ |
| 5135 | CALL0I(startup--require-comp-safetly); | 5135 | CALL0I (startup--require-comp-safely); |
| 5136 | Fputhash (function_name, definition, Vcomp_deferred_pending_h); | 5136 | Fputhash (function_name, definition, Vcomp_deferred_pending_h); |
| 5137 | CALLN (Ffuncall, intern_c_string ("native--compile-async"), | 5137 | CALLN (Ffuncall, intern_c_string ("native--compile-async"), |
| 5138 | src, Qnil, Qlate); | 5138 | src, Qnil, Qlate); |