(custom-make-dependencies): Bind to t around evaluating the def-form.

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e139cf6113e..0aca5ec5728 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-21  Richard M. Stallman  <rms@gnu.org>
+
+        * cus-dep.el (custom-make-dependencies): Bind to t
+        around evaluating the def-form.
+
+        * custom.el (custom-dont-initialize): New variable.
+        (custom-declare-variable): Don't init the variable
+        if custom-dont-initialize is non-nil.
+
 2002-09-21  John Paul Wallington  <jpw@shootybangbang.com>
 
         * net/eudc.el (eudc-install-menu): Use `define-key' and
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 19ae727b2dd..d7fd848a9ab 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -66,7 +66,7 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
                           (setq is-autoloaded t)))
                     (let ((expr (read (current-buffer))))
                       (condition-case nil
-                          (progn
+                          (let ((custom-dont-initialize t))
                             (eval expr)
                             (put (nth 1 expr) 'custom-autoloaded is-autoloaded)
                             (put (nth 1 expr) 'custom-where name))