[Emacs-diffs] Changes to emacs/lisp/custom.el,v

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/02/08 07:54:46

Index: custom.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/custom.el,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- custom.el   18 Jan 2008 05:40:59 -0000      1.142
+++ custom.el   8 Feb 2008 07:54:46 -0000       1.143
@@ -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