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

Fix up the exclusion logic in loaddefs-generate

Browse source 
* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate): Allow
excluding files completely (bug#57144).
This commit is contained in:
Lars Ingebrigtsen 2022-08-15 08:29:28 +02:00
parent d33a6b9069
commit ead4b914ca
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lisp/emacs-lisp/loaddefs-gen.el
View file

@ -570,16 +570,15 @@ instead of just updating them with the new/changed autoloads."
(time-less-p output-time
(file-attribute-modification-time
(file-attributes file))))
(setq defs (nconc
(loaddefs-generate--parse-file
file output-file
;; We only want the package name from the
;; excluded files.
(and include-package-version
(if (member (expand-file-name file) excluded-files)
'only
t)))
defs))))
;; If we're scanning for package versions, we want to look
;; at the file even if it's excluded.
(let* ((excluded (member (expand-file-name file dir) excluded-files))
(package-data
(and include-package-version (if excluded 'only t))))
(when (or package-data (not excluded))
(setq defs (nconc (loaddefs-generate--parse-file
file output-file package-data)
defs))))))
(progress-reporter-done progress))
;; If we have no autoloads data, but we have EXTRA-DATA, then