From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 23 Sep 2022 16:06:38 +0000 (+0200)
Subject: Don't overwrite cus-load dependencies
X-Git-Tag: emacs-29.0.90~1856^2~289
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=75b3f4d0ac00bf47459629615ab2246c8a34b4c6;p=emacs.git

Don't overwrite cus-load dependencies

* lisp/cus-dep.el (custom-make-dependencies): Don't overwrite
elements added by packages (bug#58015).
---

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.