Merge from origin/emacs-25

[gnu-emacs] / doc / lispref / customize.texi

diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 51d729f665c89ecdeff8048dc04b875f47cf72e1..14e6eb3ab25f5a8f5ecfa81eab19d3f2f3693532 100644 (file)
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1997-2015 Free Software Foundation, Inc.
+@c Copyright (C) 1997-2016 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @node Customization
 @chapter Customization Settings
@@ -334,7 +334,8 @@ macro accepts the following keywords:
 @item :type @var{type}
 Use @var{type} as the data type for this option.  It specifies which
 values are legitimate, and how to display the value
-(@pxref{Customization Types}).
+(@pxref{Customization Types}).  Every @code{defcustom} should specify
+a value for this keyword.
 
 @item :options @var{value-list}
 @kindex options@r{, @code{defcustom} keyword}
@@ -840,6 +841,7 @@ most general last.  Here's an example of proper usage:
 This way, the special value @code{nil} is not treated like other
 symbols, and symbols are not treated like other Lisp expressions.
 
+@cindex radio, customization types
 @item (radio @var{element-types}@dots{})
 This is similar to @code{choice}, except that the choices are displayed
 using radio buttons rather than a menu.  This has the advantage of
@@ -935,6 +937,7 @@ The value must be a list and each element of the list must fit the type
 list of elements, with @samp{[INS]} and @samp{[DEL]} buttons for adding
 more elements or removing elements.
 
+@cindex restricted-sexp, customization types
 @item (restricted-sexp :match-alternatives @var{criteria})
 This is the most general composite type construct.  The value may be
 any Lisp object that satisfies one of @var{criteria}.  @var{criteria}
@@ -1019,6 +1022,7 @@ and whose remaining arguments should be zero or more of @code{foo} and
 This matches values such as @code{(baz)}, @code{(baz foo)}, @code{(baz bar)}
 and @code{(baz foo bar)}.
 
+@cindex choice, customization types
   When the element-type is a @code{choice}, you use @code{:inline} not
 in the @code{choice} itself, but in (some of) the alternatives of the
 @code{choice}.  For example, to match a list which must start with a