From 3d0c2a29efd216c8161897a745d7e5e9e4297466 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 8 Feb 2008 07:59:31 +0000 Subject: [PATCH] (custom-theme-set-variables): Sort symbols that are dependencies before symbols that depend on them. (custom-enabled-themes): Set after custom-theme-directory. --- lisp/ChangeLog | 4 ++++ lisp/custom.el | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85d32ad2f15..6b5790b2010 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -11,6 +11,10 @@ 2008-02-08 Glenn Morris + * custom.el (custom-theme-set-variables): Sort symbols that are + dependencies before symbols that depend on them. + (custom-enabled-themes): Set after custom-theme-directory. + * pcmpl-unix.el (top-level): Move provide statement to end. (pcmpl-unix-group-file, pcmpl-unix-passwd-file): Remove leading `*' from doc-string. Allow to be nil. diff --git a/lisp/custom.el b/lisp/custom.el index 7466913eb9a..c45ba22c507 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -913,6 +913,8 @@ 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) + ;; 1 is a dependency of 2, so needs to be set first. + (1-then-2) ;; Put minor modes and symbols with :require last. ;; Putting minor modes last ensures that the mode ;; function will see other customized values rather @@ -1104,6 +1106,7 @@ This does not include the `user' theme, which is set by Customize, and always takes precedence over other Custom Themes." :group 'customize :type '(repeat symbol) + :set-after '(custom-theme-directory) ; so we can find the themes :set (lambda (symbol themes) ;; Avoid an infinite loop when custom-enabled-themes is ;; defined in a theme (e.g. `user'). Enabling the theme sets -- 2.39.5