diff options
author | Lars Ingebrigtsen <larsi@gnus.org> | 2022-09-23 18:06:38 +0200 |
---|---|---|
committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-09-23 18:06:38 +0200 |
commit | 75b3f4d0ac00bf47459629615ab2246c8a34b4c6 (patch) | |
tree | 4caeb14ca508857a1c506ac004264f323b60f7a7 /lisp/cus-dep.el | |
parent | 212e94c3f445ebe1388f6fab134133ebad9316d0 (diff) | |
download | emacs-75b3f4d0ac00bf47459629615ab2246c8a34b4c6.tar.gz |
Don't overwrite cus-load dependencies
* lisp/cus-dep.el (custom-make-dependencies): Don't overwrite
elements added by packages (bug#58015).
Diffstat (limited to 'lisp/cus-dep.el')
-rw-r--r-- | lisp/cus-dep.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el index bb07a0694a1..163a2da1f12 100644 --- a/lisp/cus-dep.el +++ b/lisp/cus-dep.el @@ -175,7 +175,10 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" (prin1 (sort found #'string<)))) alist)))))) (dolist (e (sort alist (lambda (e1 e2) (string< (car e1) (car e2))))) - (insert "(put '" (car e) " 'custom-loads '" (cdr e) ")\n"))) + ;; Don't overwrite elements added by packages. + (insert "(put '" (car e) + " 'custom-loads (append '" (cdr e) + " (get '" (car e) " 'custom-loads)))\n"))) (insert "\ ;; The remainder of this file is for handling :version. |