diff options
| author | Andrea Corallo | 2021-05-04 21:31:44 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2021-05-04 21:46:39 +0200 |
| commit | d6ddc97884c3106a59b956fbc4e4f5f3e4aaf4e2 (patch) | |
| tree | 6b4c39e9b8c370dac3103c0c1caf5e8eb08e07c9 | |
| parent | c36df52ff5c05826382d88ddbe3fffaa99d12597 (diff) | |
| download | emacs-d6ddc97884c3106a59b956fbc4e4f5f3e4aaf4e2.tar.gz emacs-d6ddc97884c3106a59b956fbc4e4f5f3e4aaf4e2.zip | |
* Do not try to load unexistent eln file if async compilation was skipped
* lisp/emacs-lisp/comp.el (comp-run-async-workers): Don't try to
load if the eln file was not produced.
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 0ebaccbe4a6..297c1f7ebca 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el | |||
| @@ -3944,11 +3944,14 @@ display a message." | |||
| 3944 | source-file) | 3944 | source-file) |
| 3945 | (comp-accept-and-process-async-output process) | 3945 | (comp-accept-and-process-async-output process) |
| 3946 | (ignore-errors (delete-file temp-file)) | 3946 | (ignore-errors (delete-file temp-file)) |
| 3947 | (when (and load1 | 3947 | (let ((eln-file (comp-el-to-eln-filename |
| 3948 | (zerop (process-exit-status process))) | 3948 | source-file1))) |
| 3949 | (native-elisp-load | 3949 | (when (and load1 |
| 3950 | (comp-el-to-eln-filename source-file1) | 3950 | (zerop (process-exit-status |
| 3951 | (eq load1 'late))) | 3951 | process)) |
| 3952 | (file-exists-p eln-file)) | ||
| 3953 | (native-elisp-load eln-file | ||
| 3954 | (eq load1 'late)))) | ||
| 3952 | (comp-run-async-workers)) | 3955 | (comp-run-async-workers)) |
| 3953 | :noquery (not comp-async-query-on-exit)))) | 3956 | :noquery (not comp-async-query-on-exit)))) |
| 3954 | (puthash source-file process comp-async-compilations)) | 3957 | (puthash source-file process comp-async-compilations)) |