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

[Richard M. Stallman]

Index: emacs/lisp/custom.el
diff -c emacs/lisp/custom.el:1.53 emacs/lisp/custom.el:1.54
*** emacs/lisp/custom.el:1.53   Sun May 19 12:07:13 2002
--- emacs/lisp/custom.el        Sat Sep 21 15:59:42 2002
***************
*** 39,44 ****
--- 39,49 ----
    ;; Customize information for this option is in `cus-edit.el'.
    "Hook called after defining each customize option.")
  
+ (defvar custom-dont-initialize nil
+   "Non-nil means `defcustom' should not initialize the variable.
+ That is used for the sake of `custom-make-dependencies'.
+ Users should not set it.")
+ 
  (defvar custom-current-group-alist nil
    "Alist of (FILE . GROUP) indicating the current group to use for FILE.")
  
***************
*** 152,158 ****
                                        'custom-variable))))))
      (put symbol 'custom-requests requests)
      ;; Do the actual initialization.
!     (funcall initialize symbol default))
    (setq current-load-list (cons symbol current-load-list))
    (run-hooks 'custom-define-hook)
    symbol)
--- 157,164 ----
                                        'custom-variable))))))
      (put symbol 'custom-requests requests)
      ;; Do the actual initialization.
!     (unless custom-dont-initialize
!       (funcall initialize symbol default)))
    (setq current-load-list (cons symbol current-load-list))
    (run-hooks 'custom-define-hook)
    symbol)