(custom-theme-set-variables): Sort symbols that are

dependencies before symbols that depend on them.
(custom-enabled-themes): Set after custom-theme-directory.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66c29fe83f3f678269e3fa68f71421046e0988c2..243018e12b876b6151f9a32c63e2055552409ef2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-08  Glenn Morris  <rgm@gnu.org>
+
+       * 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.
+
 2008-02-04  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32-vars.el (w32-system-shells): Add TCC (new name for 4NT).

diff --git a/lisp/custom.el b/lisp/custom.el
index 64c0d2e6a6f73be065b1b61021dfe887f4c6d34a..1a045483491f5ee60e30291438cdc7a02a3c3b42 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -885,7 +885,7 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
                   (memq (get symbol 'custom-autoload) '(nil noset)))
         ;; This symbol needs to be autoloaded, even just for a `set'.
         (custom-load-symbol symbol))))
- 
+
   ;; Move minor modes and variables with explicit requires to the end.
   (setq args
        (sort args
@@ -898,6 +898,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
@@ -1092,6 +1094,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