(customize-group, customize-group-other-window):

Remove unnecessary calls to custom-load-symbol.
(custom-group-value-create):
Load widget deps if state is not hidden.  If widget deps are
loaded, load them in advance.
(custom-menu-create): If widget deps are loaded, load them earlier.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd9f05c2579ed8e5f9c8930d723c063182a46887..cff51898e3ad1b825df2270c73f8aa27297a16ed 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-09  Markus Rost  <rost@math.ohio-state.edu>
+
+       * cus-edit.el (customize-group, customize-group-other-window):
+       Remove unnecessary calls to custom-load-symbol.
+       (custom-group-value-create):
+       Load widget deps if state is not hidden.  If widget deps are
+       loaded, load them in advance.
+       (custom-menu-create): If widget deps are loaded, load them earlier.
+
 2003-01-09  John Paul Wallington  <jpw@shootybangbang.com>
 
        * language/ethio-util.el (ethio-gemination)

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 6017e7b9adf08b685763408aa813b3c832523879..b13c7965882eef477bc3f603ff704332bd384c5f 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -874,7 +874,6 @@ then prompt for the MODE to customize."
     (if (string-equal "" group)
        (setq group 'emacs)
       (setq group (intern group))))
-  (custom-load-symbol group)
   (let ((name (format "*Customize Group: %s*"
                      (custom-unlispify-tag-name group))))
     (if (get-buffer name)
@@ -898,7 +897,6 @@ then prompt for the MODE to customize."
     (if (string-equal "" group)
        (setq group 'emacs)
       (setq group (intern group))))
-  (custom-load-symbol group)
   (let ((name (format "*Customize Group: %s*"
                      (custom-unlispify-tag-name group))))
     (if (get-buffer name)
@@ -3301,6 +3299,8 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
 
 (defun custom-group-value-create (widget)
   "Insert a customize group for WIDGET in the current buffer."
+  (unless (eq (widget-get widget :custom-state) 'hidden)
+      (custom-load-widget widget))
   (let* ((state (widget-get widget :custom-state))
         (level (widget-get widget :custom-level))
         ;; (indent (widget-get widget :indent))
@@ -3340,7 +3340,6 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
           (widget-put widget :buttons buttons))
          ((eq custom-buffer-style 'tree)
           (custom-browse-insert-prefix prefix)
-          (custom-load-widget widget)
           (if (zerop (length members))
               (progn
                 (custom-browse-insert-prefix prefix)
@@ -3481,7 +3480,6 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
                                             ?\ ))
           ;; Members.
           (message "Creating group...")
-          (custom-load-widget widget)
           (let* ((members (custom-sort-items members
                                              custom-buffer-sort-alphabetically
                                              custom-buffer-order-groups))
@@ -3953,13 +3951,14 @@ The menu is in a format applicable to `easy-menu-define'."
                       t)))
     (if (and (or (not (boundp 'custom-menu-nesting))
                 (>= custom-menu-nesting 0))
-            (< (length (get symbol 'custom-group)) widget-menu-max-size))
+            (progn
+              (custom-load-symbol symbol)
+              (< (length (get symbol 'custom-group)) widget-menu-max-size)))
        (let ((custom-prefix-list (custom-prefix-add symbol
                                                     custom-prefix-list))
              (members (custom-sort-items (get symbol 'custom-group)
                                          custom-menu-sort-alphabetically
                                          custom-menu-order-groups)))
-         (custom-load-symbol symbol)
          `(,(custom-unlispify-menu-entry symbol t)
            ,item
            "--"