X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/051268946f868d2ff01e821fdd092d5632afb624..b0c9a334c2f0eb881eff47f590997e746cc3bdb3:/lisp/custom.el

diff --git a/lisp/custom.el b/lisp/custom.el
index b2ab004dc8..0831535f18 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1,7 +1,7 @@
 ;;; custom.el --- tools for declaring and initializing options
 ;;
-;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2004, 2005
-;;  Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
@@ -80,9 +80,9 @@ if any, or VALUE."
   "Like `custom-initialize-set', but catches errors.
 If an error occurs during initialization, SYMBOL is set to nil
 and no error is thrown.  This is meant for use in pre-loaded files
-where some variables used to compute VALUE are not yet defined.
-You can then re-evaluate VALUE in startup.el, for instance using
-`custom-reevaluate-setting'."
+where some variables or functions used to compute VALUE may not yet
+be defined.  You can then re-evaluate VALUE in startup.el, for instance
+using `custom-reevaluate-setting'."
   (condition-case nil
       (custom-initialize-set symbol value)
     (error (set-default symbol nil))))
@@ -91,9 +91,9 @@ You can then re-evaluate VALUE in startup.el, for instance using
   "Like `custom-initialize-default', but catches errors.
 If an error occurs during initialization, SYMBOL is set to nil
 and no error is thrown.  This is meant for use in pre-loaded files
-where some variables used to compute VALUE are not yet defined.
-You can then re-evaluate VALUE in startup.el, for instance using
-`custom-reevaluate-setting'."
+where some variables or functions used to compute VALUE may not yet
+be defined.  You can then re-evaluate VALUE in startup.el, for instance
+using `custom-reevaluate-setting'."
   (condition-case nil
       (custom-initialize-default symbol value)
     (error (set-default symbol nil))))
@@ -584,7 +584,7 @@ This recursively follows aliases."
    "Themes that have been defined with `deftheme'.
 The default value is the list (user standard).  The theme `standard'
 contains the Emacs standard settings from the original Lisp files.  The
-theme `user' contains all the the settings the user customized and saved.
+theme `user' contains all the settings the user customized and saved.
 Additional themes declared with the `deftheme' macro will be added to
 the front of this list.")
 
@@ -726,15 +726,13 @@ 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)
-			;; Put symbols with :require last.  The macro
-			;; define-minor-mode generates a defcustom
-			;; with a :require and a :set, where the
-			;; setter function calls the mode function.
-			;; Putting symbols with :require last ensures
-			;; that the mode function will see other
-			;; customized values rather than default
-			;; values.
-			(t (nth 3 a2)))))))
+			;; Put minor modes and symbols with :require last.
+			;; Putting minor modes last ensures that the mode
+			;; function will see other customized values rather
+			;; than default values.
+			(t (or (nth 3 a2)
+                               (eq (get sym2 'custom-set)
+                                   'custom-set-minor-mode))))))))
   (while args
     (let ((entry (car args)))
       (if (listp entry)