Changeset 4161 for trunk/lisp/custom.el

Timestamp:

09/09/06 16:30:10 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/custom.el (modified) (2 diffs)

trunk/lisp/custom.el

@@ -875 +875 @@
-in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
-  (custom-check-theme theme)
+ 
+  ;; Process all the needed autoloads before anything else, so that the
+  ;; subsequent code has all the info it needs (e.g. which var corresponds
+  ;; to a minor mode), regardless of the ordering of the variables.
+  (dolist (entry args)
+    (let* ((symbol (indirect-variable (nth 0 entry))))
+      (unless (or (get symbol 'standard-value)
+                  (memq (get symbol 'custom-autoload) '(nil noset)))
+        ;; This symbol needs to be autoloaded, even just for a `set'.
+        (custom-load-symbol symbol))))
+ 
+  ;; Move minor modes and variables with explicit requires to the end.
-  (setq args
-        (sort args
@@ -905 +917 @@
-              (put symbol 'custom-requests requests)
-              (mapc 'require requests))
-            (unless (or (get symbol 'standard-value)
-                        (memq (get symbol 'custom-autoload) '(nil noset)))
-              ;; This symbol needs to be autoloaded, even just for a `set'.
-              (custom-load-symbol symbol))
-            (setq set (or (get symbol 'custom-set) 'custom-set-default))
-            (put symbol 'saved-value (list value))