From b6790c3eec383718d9918c95e058581f75b1368d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 24 Aug 2005 11:49:07 +0000 Subject: [PATCH] (custom-theme-set-variables): Sort minor modes last. --- lisp/custom.el | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lisp/custom.el b/lisp/custom.el index 38b3355c2c3..0831535f181 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -726,15 +726,13 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')." (error "Circular custom dependency between `%s' and `%s'" sym1 sym2)) (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 (nth 3 a2))))))) + ;; Put minor modes and symbols with :require last. + ;; Putting minor modes last ensures that the mode + ;; function will see other customized values rather + ;; than default values. + (t (or (nth 3 a2) + (eq (get sym2 'custom-set) + 'custom-set-minor-mode)))))))) (while args (let ((entry (car args))) (if (listp entry) -- 2.39.2