From da5e05a50e8713f5efb51567645822fa5bfdd6b7 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Mon, 31 Jul 2023 23:10:03 -0700 Subject: [PATCH] Fix handling of ".elpaignore" file when compiling packages * lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): Treat 'byte-compile-ignore-files' as a list of regexps per its docstring (bug#64985). --- lisp/emacs-lisp/bytecomp.el | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 5df1205869c..65ccb60726f 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1922,6 +1922,8 @@ also be compiled." (emacs-lisp-compilation-mode)) (let ((directories (list default-directory)) (default-directory default-directory) + (ignore-files-regexp + (mapconcat #'identity byte-compile-ignore-files "\\|")) (skip-count 0) (fail-count 0) (file-count 0) @@ -1942,9 +1944,7 @@ also be compiled." (or (null arg) (eq 0 arg) (y-or-n-p (concat "Check " source "? "))) ;; Directory is requested to be ignored - (not (string-match-p - (regexp-opt byte-compile-ignore-files) - source)) + (not (string-match-p ignore-files-regexp source)) (setq directories (nconc directories (list source)))) ;; It is an ordinary file. Decide whether to compile it. (if (and (string-match emacs-lisp-file-regexp source) @@ -1954,9 +1954,7 @@ also be compiled." (not (auto-save-file-name-p source)) (not (member source (dir-locals--all-files directory))) ;; File is requested to be ignored - (not (string-match-p - (regexp-opt byte-compile-ignore-files) - source))) + (not (string-match-p ignore-files-regexp source))) (progn (cl-incf (pcase (byte-recompile-file source force arg) ('no-byte-compile skip-count) -- 2.39.5