diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-02-08 07:59:31 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-02-08 07:59:31 +0000 |
| commit | 3d0c2a29efd216c8161897a745d7e5e9e4297466 (patch) | |
| tree | 236fe979028858508f28c4f05789b34525154cb3 /lisp/custom.el | |
| parent | 507f2b9152447e865ad00f3c978bdb74f76f1ab2 (diff) | |
| download | emacs-3d0c2a29efd216c8161897a745d7e5e9e4297466.tar.gz | |
(custom-theme-set-variables): Sort symbols that are
dependencies before symbols that depend on them.
(custom-enabled-themes): Set after custom-theme-directory.
Diffstat (limited to 'lisp/custom.el')
| -rw-r--r-- | lisp/custom.el | 3 |
1 files changed, 3 insertions, 0 deletions
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 |