diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-08-04 03:17:50 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-08-04 03:17:50 -0400 |
| commit | 54d7426428411a3e1a76add7427a06f049bb92f6 (patch) | |
| tree | 84901bf5184a63cde16e9f0fd9d55da3f69f7409 /lisp/emacs-lisp/bytecomp.el | |
| parent | d7eb09b7076ea25ce2294a9c126c68b7ea290d44 (diff) | |
| parent | 6eddbfe33f2ff07f186da14f8974e742bf3ca2ae (diff) | |
| download | emacs-54d7426428411a3e1a76add7427a06f049bb92f6.tar.gz emacs-54d7426428411a3e1a76add7427a06f049bb92f6.tar.bz2 emacs-54d7426428411a3e1a76add7427a06f049bb92f6.zip | |
Merge from origin/emacs-29
6eddbfe33f2 Clarify the meaning of the argument of ':align-to' space ...
5c6a51668b0 ; * doc/misc/eshell.texi (Argument Modifiers): Fix typo i...
da5e05a50e8 Fix handling of ".elpaignore" file when compiling packages
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 5b1d958e6c2..f0656628236 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1975,6 +1975,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) @@ -1995,9 +1997,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) @@ -2007,9 +2007,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) |