From: Andrea Corallo <akrl@sdf.org>
Date: Tue, 14 Apr 2020 07:48:24 +0000 (+0100)
Subject: * lisp/emacs-lisp/comp.el (native-compile-async): Better error message.
X-Git-Tag: emacs-28.0.90~2727^2~701
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8decfbe4d75b538707fa794c395d712bfde407f4;p=emacs.git

* lisp/emacs-lisp/comp.el (native-compile-async): Better error message.
---

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index fda8f7dc780..788ffb5b776 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)