Mercurial > emacs
changeset 91651:e36db3830982
(custom-theme-set-variables): Sort symbols that are
dependencies before symbols that depend on them.
(custom-enabled-themes): Set after custom-theme-directory.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 08 Feb 2008 07:54:46 +0000 |
| parents | 89a885e91568 |
| children | 30778acdaa00 |
| files | lisp/custom.el |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/custom.el Fri Feb 08 07:49:24 2008 +0000 +++ b/lisp/custom.el Fri Feb 08 07:54:46 2008 +0000 @@ -913,6 +913,8 @@ (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 @@ 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