diff options
| author | Chong Yidong | 2012-02-06 20:36:31 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-02-06 20:36:31 +0800 |
| commit | 9a6dd7472a531b065e2f353b280755d49b50d813 (patch) | |
| tree | 96df985c8628f36ef41124f2decc940b5bf3fa71 | |
| parent | b737198d07688dea61ff1e6fbe3867714490dbf9 (diff) | |
| download | emacs-9a6dd7472a531b065e2f353b280755d49b50d813.tar.gz emacs-9a6dd7472a531b065e2f353b280755d49b50d813.zip | |
* lisp/custom.el (defcustom): Doc fix.
Fixes: debbugs:9711
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/custom.el | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1fa62f4b1b9..f0f438e540e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-02-06 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * custom.el (defcustom): Doc fix (Bug#9711). | ||
| 4 | |||
| 1 | 2012-02-05 Chong Yidong <cyd@gnu.org> | 5 | 2012-02-05 Chong Yidong <cyd@gnu.org> |
| 2 | 6 | ||
| 3 | * cus-edit.el (custom-variable-reset-backup): Quote the value | 7 | * cus-edit.el (custom-variable-reset-backup): Quote the value |
diff --git a/lisp/custom.el b/lisp/custom.el index 962336978b1..a879c7f76a0 100644 --- a/lisp/custom.el +++ b/lisp/custom.el | |||
| @@ -200,10 +200,14 @@ set to nil, as the value is no longer rogue." | |||
| 200 | 200 | ||
| 201 | (defmacro defcustom (symbol value doc &rest args) | 201 | (defmacro defcustom (symbol value doc &rest args) |
| 202 | "Declare SYMBOL as a customizable variable that defaults to VALUE. | 202 | "Declare SYMBOL as a customizable variable that defaults to VALUE. |
| 203 | SYMBOL is the variable name; it should not be quoted. | ||
| 204 | VALUE is an expression specifying the variable's standard value. | ||
| 205 | This expression should not be quoted. It is evaluated once by | ||
| 206 | `defcustom', and the value is assigned to SYMBOL if the variable | ||
| 207 | is unbound. The expression may also be re-evaluated by Customize | ||
| 208 | whenever it needs to get the variable's standard value. | ||
| 203 | DOC is the variable documentation. | 209 | DOC is the variable documentation. |
| 204 | 210 | ||
| 205 | Neither SYMBOL nor VALUE need to be quoted. | ||
| 206 | If SYMBOL is not already bound, initialize it to VALUE. | ||
| 207 | The remaining arguments should have the form | 211 | The remaining arguments should have the form |
| 208 | 212 | ||
| 209 | [KEYWORD VALUE]... | 213 | [KEYWORD VALUE]... |