[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 9f42f35 1/2: * Fix native-compile-async for bug#4060
From: |
Andrea Corallo |
Subject: |
feature/native-comp 9f42f35 1/2: * Fix native-compile-async for bug#40602. |
Date: |
Mon, 13 Apr 2020 15:51:44 -0400 (EDT) |
branch: feature/native-comp
commit 9f42f35418c568ae22eca65ecec773ff40f2fc0e
Author: Andrea Corallo <address@hidden>
Commit: Andrea Corallo <address@hidden>
* Fix native-compile-async for bug#40602.
* lisp/emacs-lisp/comp.el (native-compile-async): Relax coherency condition.
---
lisp/emacs-lisp/comp.el | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 9dc775b..a4764f9 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2311,9 +2311,13 @@ LOAD can be nil t or 'late."
(list "Path not a file nor directory" path)))))
(dolist (file files)
(if-let ((entry (cl-find file comp-files-queue :key #'car :test
#'string=)))
- (cl-assert (eq load (cdr entry))
- nil "Incoherent load kind in compilation queue for %s"
- file)
+ (when load
+ ;; When no load is specified (plain async compilation) we
+ ;; consider valid the one previously queued, otherwise we
+ ;; check for coherence (bug#40602).
+ (cl-assert (eq load (cdr entry))
+ nil "Incoherent load kind in compilation queue for %s"
+ file))
(setf comp-files-queue (append comp-files-queue `((,file . ,load))))))
(when (zerop (comp-async-runnings))
(comp-run-async-workers)