(custom-set-variables): Set options with :require

clauses last.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88cb2175940080359865ebe6eeef4c7484639085..854d1722cef0f216edad056c4470b538be4f2768 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2001-08-02  Gerd Moellmann  <gerd@gnu.org>
 
+       * custom.el (custom-set-variables): Set options with :require
+       clauses last.
+       
        * custom.el (defcustom): Doc fix.
 
        * Makefile.in (TAGS, TAGS-LISP): Exclude loaddefs.el.

diff --git a/lisp/custom.el b/lisp/custom.el
index ef083ebb238e5e8fb9a6818ec73766cb8d8bcdfd..8231fd9ab0f36a16e00c09c44f59a16c96b2c8ab 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -442,7 +442,16 @@ COMMENT is a comment string about SYMBOL."
                         (error "Circular custom dependency between `%s' and `%s'"
                                sym1 sym2))
                        (1-then-2 t)
-                       (t nil))))))
+                       (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 (get sym2 'custom-requests)))))))
   (while args
     (let ((entry (car args)))
       (if (listp entry)