summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/cus-dep.el24
2 files changed, 24 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4eb73aa7c59..ac9363bbbbd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-13 Markus Rost <rost@math.ohio-state.edu>
+
+ * cus-dep.el (custom-make-dependencies): Don't set standard-value
+ and version numbers for variables. Handle faces.
+
+ * cus-edit.el (customize-changed-options): Doc addition. Load the
+ version deps earlier. Use other tests for groups and variables.
+ Handle faces.
+
2003-01-14 Kim F. Storm <storm@cua.dk>
* ido.el (ido-ignore-directories-merge): Doc fix.
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index aeec07ae4f0..67b1f8b3966 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -139,15 +139,10 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
(when version
(setq where (get symbol 'custom-where))
(when where
- (insert "(custom-put-if-not '" (symbol-name symbol)
- " 'custom-version ")
- (prin1 version (current-buffer))
- (insert ")\n")
- (insert "(custom-put-if-not '" (symbol-name symbol))
- (if (get symbol 'standard-value)
- ;; This means it's a variable
+ (if (or (custom-variable-p symbol)
+ (custom-facep symbol))
+ ;; This means it's a variable or a face.
(progn
- (insert " 'standard-value t)\n")
(if (assoc version version-alist)
(unless
(member where
@@ -155,9 +150,20 @@ Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS"
(push where (cdr (assoc version version-alist))))
(push (cons version (list where)) version-alist)))
;; This is a group
+ (insert "(custom-put-if-not '" (symbol-name symbol)
+ " 'custom-version ")
+ (prin1 version (current-buffer))
+ (insert ")\n")
+ (insert "(custom-put-if-not '" (symbol-name symbol))
(insert " 'group-documentation ")
(prin1 (get symbol 'group-documentation) (current-buffer))
- (insert ")\n")))))))
+ (insert ")\n")
+ (when (get symbol 'custom-tag)
+ (insert "(custom-put-if-not '" (symbol-name symbol))
+ (insert " 'custom-tag ")
+ (prin1 (get symbol 'custom-tag) (current-buffer))
+ (insert ")\n"))
+ ))))))
(insert "\n(defvar custom-versions-load-alist "
(if version-alist "'" ""))