Changeset 4131 for trunk/lisp/custom.el

Timestamp:

07/29/06 07:48:34 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

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

trunk/lisp/custom.el

@@ -559 +559 @@
-      (put symbol 'custom-loads (cons (purecopy load) loads)))))
-
-
-
-
+
+
+
+
-  (custom-add-load symbol load))
-
@@ -700 +701 @@
-         (old (or (get symbol 'saved-value) (get symbol 'standard-value))))
-    ;; Mark default value as set iff different from old value.
-or (null old)
-           (not
-                               
-                               
+not (and old
+                 
+                                 
+                                 
-        (progn (put symbol 'customized-value (list (custom-quote value)))
-               (custom-push-theme 'theme-value symbol 'user 'set
@@ -828 +829 @@
-                     (boundp symbol))
-                (let ((sv (get symbol 'standard-value)))
-
-
-
-
-
-
-
+
+
+
-              (if (and (facep symbol)
-                       (not (face-spec-match-p symbol (get symbol 'face-defface-spec))))
@@ -908 +905 @@
-              (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))
@@ -927 +928 @@
-            (and (or now (default-boundp symbol))
-                 (put symbol 'variable-comment comment)))
+        ;; I believe this is dead-code, because the `sort' code above would
+        ;; have burped before we could get here.  --Stef
-        ;; Old format, a plist of SYMBOL VALUE pairs.
-        (message "Warning: old format `custom-set-variables'")