Minor fixes for text of help-echo in some options.

[gnu-emacs] / lisp / custom.el

diff --git a/lisp/custom.el b/lisp/custom.el
index ef083ebb238e5e8fb9a6818ec73766cb8d8bcdfd..43c3184469da73e492da62a4e5d6a7b4290ff77d 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -172,7 +172,7 @@ The following keywords are meaningful:
        VALUE should be a function used to initialize the
        variable.  It takes two arguments, the symbol and value
        given in the `defcustom' call.  The default is
-       `custom-initialize-default'
+       `custom-initialize-reset.'
 :set   VALUE should be a function to set the value of the symbol.
        It takes two arguments, the symbol to set and the value to
        give it.  The default choice of function is `custom-set-default'.
@@ -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 (nth 3 a2)))))))
   (while args
     (let ((entry (car args)))
       (if (listp entry)