[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 75b3f4d0ac 2/2: Don't overwrite cus-load dependencies
From: |
Lars Ingebrigtsen |
Subject: |
master 75b3f4d0ac 2/2: Don't overwrite cus-load dependencies |
Date: |
Fri, 23 Sep 2022 12:07:20 -0400 (EDT) |
branch: master
commit 75b3f4d0ac00bf47459629615ab2246c8a34b4c6
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Don't overwrite cus-load dependencies
* lisp/cus-dep.el (custom-make-dependencies): Don't overwrite
elements added by packages (bug#58015).
---
lisp/cus-dep.el | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index bb07a0694a..163a2da1f1 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.