aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/custom.el6
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3b5a4d9486..6ec2cd2f038 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-02-15 Chong Yidong <cyd@gnu.org>
2
3 * custom.el (defcustom): Doc fix; note use of defvar.
4
12012-02-15 Glenn Morris <rgm@gnu.org> 52012-02-15 Glenn Morris <rgm@gnu.org>
2 6
3 * mail/smtpmail.el (smtpmail-smtp-user, smtpmail-stream-type): 7 * mail/smtpmail.el (smtpmail-smtp-user, smtpmail-stream-type):
diff --git a/lisp/custom.el b/lisp/custom.el
index 2d880d23955..810b78144a4 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -208,7 +208,11 @@ is unbound. The expression itself is also stored, so that
208Customize can re-evaluate it later to get the standard value. 208Customize can re-evaluate it later to get the standard value.
209DOC is the variable documentation. 209DOC is the variable documentation.
210 210
211The remaining arguments should have the form 211This macro uses `defvar' as a subroutine, which also marks the
212variable as \"special\", so that it is always dynamically bound
213even when `lexical-binding' is t.
214
215The remaining arguments to `defcustom' should have the form
212 216
213 [KEYWORD VALUE]... 217 [KEYWORD VALUE]...
214 218