aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2005-07-11 05:41:57 +0000
committerRichard M. Stallman2005-07-11 05:41:57 +0000
commit8989771d605dfc49ed520dbf08dc4049bd1d9bdd (patch)
tree3c9a90961b400acc1a26832d502f5fbb23ba65f8
parent5176af43d1492c5d9c92a5b91db0b4b08a10749e (diff)
downloademacs-8989771d605dfc49ed520dbf08dc4049bd1d9bdd.tar.gz
emacs-8989771d605dfc49ed520dbf08dc4049bd1d9bdd.zip
(custom-declare-variable): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/custom.el7
2 files changed, 3 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b99648474e4..859f5b3e2e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12005-07-11 Richard M. Stallman <rms@gnu.org> 12005-07-11 Richard M. Stallman <rms@gnu.org>
2 2
3 * custom.el (custom-declare-variable): Doc fix.
4
3 * dired-aux.el (dired-compare-directories): Remove "." and ".." 5 * dired-aux.el (dired-compare-directories): Remove "." and ".."
4 from the alists. 6 from the alists.
5 7
diff --git a/lisp/custom.el b/lisp/custom.el
index b0c4877d5c8..8e9818b71e7 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -137,14 +137,9 @@ For the standard setting, use `set-default'."
137DEFAULT should be an expression to evaluate to compute the default value, 137DEFAULT should be an expression to evaluate to compute the default value,
138not the default value itself. 138not the default value itself.
139 139
140DEFAULT is stored as SYMBOL's value in the standard theme. See 140DEFAULT is stored as SYMBOL's standard value, in SYMBOL's property
141`custom-known-themes' for a list of known themes. For backwards
142compatibility, DEFAULT is also stored in SYMBOL's property
143`standard-value'. At the same time, SYMBOL's property `force-value' is 141`standard-value'. At the same time, SYMBOL's property `force-value' is
144set to nil, as the value is no longer rogue." 142set to nil, as the value is no longer rogue."
145 ;; Remember the standard setting. The value should be in the standard
146 ;; theme, not in this property. However, this would require changing
147 ;; the C source of defvar and others as well...
148 (put symbol 'standard-value (list default)) 143 (put symbol 'standard-value (list default))
149 ;; Maybe this option was rogue in an earlier version. It no longer is. 144 ;; Maybe this option was rogue in an earlier version. It no longer is.
150 (when (get symbol 'force-value) 145 (when (get symbol 'force-value)