1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 10:31:37 -08:00

Fix up the exclusion logic in loaddefs-generate

* 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

View file

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