aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-02 15:36:11 +0200
committerLars Magne Ingebrigtsen2011-07-02 15:36:11 +0200
commit0ec389b9771ea943a0710fa529c88af37a295d43 (patch)
treeae57e4839d6a24595a00fe66f8463300986e1221
parente17d05e2ef0ef1982d4fe7ecad4f7124506ca57b (diff)
downloademacs-0ec389b9771ea943a0710fa529c88af37a295d43.tar.gz
emacs-0ec389b9771ea943a0710fa529c88af37a295d43.zip
* customize.texi (Type Keywords): Clarify that :value provides a
default value for all types. Fixes: debbugs:7386
-rw-r--r--doc/lispref/ChangeLog3
-rw-r--r--doc/lispref/customize.texi10
2 files changed, 9 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 8cea06eb30a..d458dcc207a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,8 @@
12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * customize.texi (Type Keywords): Clarify that :value provides a
4 default value for all types (bug#7386).
5
3 * streams.texi (Output Functions): Document `pp'. 6 * streams.texi (Output Functions): Document `pp'.
4 7
52011-06-25 Chong Yidong <cyd@stupidchicken.com> 82011-06-25 Chong Yidong <cyd@stupidchicken.com>
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index e58c8c298c9..cb32d0ef340 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -1035,7 +1035,12 @@ meanings:
1035 1035
1036@table @code 1036@table @code
1037@item :value @var{default} 1037@item :value @var{default}
1038This is used for a type that appears as an alternative inside of 1038Provide a default value.
1039
1040If @code{nil} is not a valid value for the alternative, then it is
1041essential to specify a valid default with @code{:value}.
1042
1043If you use this for a type that appears as an alternative inside of
1039@code{choice}; it specifies the default value to use, at first, if and 1044@code{choice}; it specifies the default value to use, at first, if and
1040when the user selects this alternative with the menu in the 1045when the user selects this alternative with the menu in the
1041customization buffer. 1046customization buffer.
@@ -1043,9 +1048,6 @@ customization buffer.
1043Of course, if the actual value of the option fits this alternative, it 1048Of course, if the actual value of the option fits this alternative, it
1044will appear showing the actual value, not @var{default}. 1049will appear showing the actual value, not @var{default}.
1045 1050
1046If @code{nil} is not a valid value for the alternative, then it is
1047essential to specify a valid default with @code{:value}.
1048
1049@item :format @var{format-string} 1051@item :format @var{format-string}
1050@kindex format@r{, customization keyword} 1052@kindex format@r{, customization keyword}
1051This string will be inserted in the buffer to represent the value 1053This string will be inserted in the buffer to represent the value