diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-06-01 22:32:03 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-06-01 22:32:03 -0400 |
| commit | 804415b8cc1dab0f2f49ad05bb5f47431fcc9e57 (patch) | |
| tree | 4056b183bf6dd1d85a48f7a995a1f3795314d5f1 /lisp/emacs-lisp | |
| parent | 5255fa452f338c2ae97fa1ade70b396513bc6e9b (diff) | |
| parent | d9e106c72ee0cf7110beb6749790231b6dcca304 (diff) | |
| download | emacs-804415b8cc1dab0f2f49ad05bb5f47431fcc9e57.tar.gz emacs-804415b8cc1dab0f2f49ad05bb5f47431fcc9e57.tar.bz2 emacs-804415b8cc1dab0f2f49ad05bb5f47431fcc9e57.zip | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/loaddefs-gen.el | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el index 02f584d0af6..e5a5c21d234 100644 --- a/lisp/emacs-lisp/loaddefs-gen.el +++ b/lisp/emacs-lisp/loaddefs-gen.el @@ -508,6 +508,13 @@ If INCLUDE-PACKAGE-VERSION, include package version data." (directory-files (expand-file-name d) t files-re)) (if (consp dir) dir (list dir))))) + (updating (and (file-exists-p output-file) + ;; Always do a complete update if loaddefs-gen.el + ;; has been updated and we're doing a base build. + include-package-version + (file-newer-than-file-p + output-file + (expand-file-name "emacs-lisp/loaddefs-gen.el")))) (defs nil)) ;; Collect all the autoload data. @@ -518,7 +525,7 @@ If INCLUDE-PACKAGE-VERSION, include package version data." (file-count 0)) (dolist (file files) (progress-reporter-update progress (setq file-count (1+ file-count))) - (when (or (not (file-exists-p output-file)) + (when (or (not updating) (file-newer-than-file-p file output-file)) (setq defs (nconc (loaddefs-generate--parse-file @@ -536,7 +543,7 @@ If INCLUDE-PACKAGE-VERSION, include package version data." (dolist (fdefs (seq-group-by #'car defs)) (let ((loaddefs-file (car fdefs))) (with-temp-buffer - (if (file-exists-p loaddefs-file) + (if (and updating (file-exists-p loaddefs-file)) (insert-file-contents loaddefs-file) (insert (loaddefs-generate--rubric loaddefs-file nil t)) (search-backward "\f") |