[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 8decfbe 1/3: * lisp/emacs-lisp/comp.el (native-compi
From: |
Andrea Corallo |
Subject: |
feature/native-comp 8decfbe 1/3: * lisp/emacs-lisp/comp.el (native-compile-async): Better error message. |
Date: |
Tue, 14 Apr 2020 13:52:04 -0400 (EDT) |
branch: feature/native-comp
commit 8decfbe4d75b538707fa794c395d712bfde407f4
Author: Andrea Corallo <address@hidden>
Commit: Andrea Corallo <address@hidden>
* lisp/emacs-lisp/comp.el (native-compile-async): Better error message.
---
lisp/emacs-lisp/comp.el | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index fda8f7d..788ffb5 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2311,13 +2311,14 @@ 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=)))
- (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))
+ ;; When no load is specified (plain async compilation) we
+ ;; consider valid the one previously queued, otherwise we
+ ;; check for coherence (bug#40602).
+ (cl-assert (or (null load)
+ (eq load (cdr entry)))
+ nil "Trying to queue %s with LOAD %s but this is already \
+queued with LOAD %"
+ file load (cdr entry))
(setf comp-files-queue (append comp-files-queue `((,file . ,load))))))
(when (zerop (comp-async-runnings))
(comp-run-async-workers)