]> git.eshelyaron.com Git - emacs.git/commitdiff
* Fix `comp-deferred-compilation-black-list' effectiveness
authorAndrea Corallo <akrl@sdf.org>
Sun, 10 May 2020 07:48:50 +0000 (08:48 +0100)
committerAndrea Corallo <akrl@sdf.org>
Sun, 10 May 2020 08:34:21 +0000 (09:34 +0100)
* lisp/emacs-lisp/comp.el (native-compile-async): Fix logic for
'comp-deferred-compilation-black-list' effectiveness.

lisp/emacs-lisp/comp.el

index e6a43b85afb969e5dcb47ca1ed32cf2dd847d203..c2a95feec1070f6822333adbc3214089edc4ac6e 100644 (file)
@@ -2376,12 +2376,13 @@ LOAD can be nil t or 'late."
 queued with LOAD %"
                      file load (cdr entry))
         ;; Make sure we are not already compiling `file' (bug#40838).
-        (unless (and (gethash file comp-async-compilations)
-                     ;; Exclude some file from deferred compilation if
-                     ;; `comp-deferred-compilation-black-list' says so.
-                     (or (not (eq load 'late))
-                         (cl-notany (lambda (re) (string-match re file))
-                                    comp-deferred-compilation-black-list)))
+        (unless (or (gethash file comp-async-compilations)
+                    ;; Also exclude files from deferred compilation if
+                    ;; any of the regexps in
+                    ;; `comp-deferred-compilation-black-list' matches.
+                    (and (eq load 'late)
+                         (cl-some (lambda (re) (string-match re file))
+                                  comp-deferred-compilation-black-list)))
           (let ((out-dir (comp-output-directory file))
                 (out-filename (comp-output-filename file)))
             (if (or (file-writable-p out-filename)