# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1202457286 0
# Node ID e36db383098240e3a748c803d52aba6a5fe1e3ab
# Parent  89a885e91568b58566e05dedf11130e291fa58cc
(custom-theme-set-variables): Sort symbols that are
dependencies before symbols that depend on them.
(custom-enabled-themes): Set after custom-theme-directory.

diff -r 89a885e91568 -r e36db3830982 lisp/custom.el
--- 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