procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of ".elpaignore" file when compiling packages

Browse source 
* lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): Treat
'byte-compile-ignore-files' as a list of regexps per its docstring
(bug#64985).
This commit is contained in:
Jim Porter 2023-07-31 23:10:03 -07:00
parent 608a8757d9
commit da5e05a50e
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/emacs-lisp/bytecomp.el
View file

@ -1922,6 +1922,8 @@ also be compiled."
(emacs-lisp-compilation-mode)) (emacs-lisp-compilation-mode))
(let ((directories (list default-directory)) (let ((directories (list default-directory))
(default-directory default-directory) (default-directory default-directory)
(ignore-files-regexp
(mapconcat #'identity byte-compile-ignore-files "\\|"))
(skip-count 0) (skip-count 0)
(fail-count 0) (fail-count 0)
(file-count 0) (file-count 0)
@ -1942,9 +1944,7 @@ also be compiled."
(or (null arg) (eq 0 arg) (or (null arg) (eq 0 arg)
(y-or-n-p (concat "Check " source "? "))) (y-or-n-p (concat "Check " source "? ")))
;; Directory is requested to be ignored ;; Directory is requested to be ignored
(not (string-match-p (not (string-match-p ignore-files-regexp source))
(regexp-opt byte-compile-ignore-files)
source))
(setq directories (nconc directories (list source)))) (setq directories (nconc directories (list source))))
;; It is an ordinary file. Decide whether to compile it. ;; It is an ordinary file. Decide whether to compile it.
(if (and (string-match emacs-lisp-file-regexp source) (if (and (string-match emacs-lisp-file-regexp source)
@ -1954,9 +1954,7 @@ also be compiled."
(not (auto-save-file-name-p source)) (not (auto-save-file-name-p source))
(not (member source (dir-locals--all-files directory))) (not (member source (dir-locals--all-files directory)))
;; File is requested to be ignored ;; File is requested to be ignored
(not (string-match-p (not (string-match-p ignore-files-regexp source)))
(regexp-opt byte-compile-ignore-files)
source)))
(progn (cl-incf (progn (cl-incf
(pcase (byte-recompile-file source force arg) (pcase (byte-recompile-file source force arg)
('no-byte-compile skip-count) ('no-byte-compile skip-count)