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

[Stefan Monnier]

Index: emacs/lisp/custom.el
diff -c emacs/lisp/custom.el:1.98 emacs/lisp/custom.el:1.99
*** emacs/lisp/custom.el:1.98   Sat Aug  6 22:13:42 2005
--- emacs/lisp/custom.el        Wed Aug 24 11:49:07 2005
***************
*** 726,740 ****
                         (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)))))))
    (while args
      (let ((entry (car args)))
        (if (listp entry)
--- 726,738 ----
                         (error "Circular custom dependency between `%s' and 
`%s'"
                                sym1 sym2))
                        (2-then-1 nil)
!                       ;; 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)