From 9bc0a7c408237f7dc6846544e647da7b08988ab9 Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Sun, 10 May 2020 08:48:50 +0100 Subject: [PATCH] * Fix `comp-deferred-compilation-black-list' effectiveness * lisp/emacs-lisp/comp.el (native-compile-async): Fix logic for 'comp-deferred-compilation-black-list' effectiveness. --- lisp/emacs-lisp/comp.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index e6a43b85afb..c2a95feec10 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -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) -- 2.39.5