From cb3f945fa83c3559eccd040d377f41596b1efe5e Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 2 Aug 2001 10:11:57 +0000 Subject: [PATCH] (custom-set-variables): Set options with :require clauses last. --- lisp/ChangeLog | 3 +++ lisp/custom.el | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 88cb2175940..854d1722cef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2001-08-02 Gerd Moellmann + * custom.el (custom-set-variables): Set options with :require + clauses last. + * custom.el (defcustom): Doc fix. * Makefile.in (TAGS, TAGS-LISP): Exclude loaddefs.el. diff --git a/lisp/custom.el b/lisp/custom.el index ef083ebb238..8231fd9ab0f 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -442,7 +442,16 @@ COMMENT is a comment string about SYMBOL." (error "Circular custom dependency between `%s' and `%s'" sym1 sym2)) (1-then-2 t) - (t nil)))))) + (2-then-1 nil) + ;; Put symbols with :require last. The macro + ;; define-minor-mode generates a defcustom + ;; with a :require and a :set, where the + ;; setter function calls the mode function. + ;; Putting symbols with :require last ensures + ;; that the mode function will see other + ;; customized values rather than default + ;; values. + (t (get sym2 'custom-requests))))))) (while args (let ((entry (car args))) (if (listp entry) -- 2.39.2