* abbrevs.texi (Abbrev Mode): abbrev-mode is an option.

* backups.texi (Making Backups): backup-directory-alist and
make-backup-file-name-function are options.
(Auto-Saving): auto-save-list-file-prefix is an option.

* buffers.texi (Killing Buffers): buffer-offer-save is an
option.

* display.texi (Refresh Screen): no-redraw-on-reenter is an
option.
(Echo Area Customization): echo-keystrokes is an option.
(Selective Display): selective-display-ellipses is an option.
(Temporary Displays): temp-buffer-show-function is an option.
(Face Attributes): underline-minimum-offset and x-bitmap-file-path
are options.
(Font Selection): face-font-family-alternatives,
face-font-selection-order, face-font-registry-alternatives, and
scalable-fonts-allowed are options.
(Fringe Indicators): indicate-buffer-boundaries is an option.
(Fringe Cursors): overflow-newline-into-fringe is an option.
(Scroll Bars): scroll-bar-mode is an option.

* eval.texi (Eval): max-lisp-eval-depth is an option.

* files.texi (Visiting Functions): find-file-hook is an option.
(Directory Names): directory-abbrev-alist is an option.
(Unique File Names): temporary-file-directory and
small-temporary-file-directory are options.

* frames.texi (Initial Parameters): initial-frame-alist,
minibuffer-frame-alist and default-frame-alist are options.
(Cursor Parameters): blink-cursor-alist and
cursor-in-non-selected-windows ar options.
(Window System Selections): selection-coding-system is an
option.
(Display Feature Testing): display-mm-dimensions-alist is an
option.

* help.texi (Help Functions): help-char and help-event-list are
options.

* keymaps.texi (Functions for Key Lookup): meta-prefix-char is
an option.

* minibuf.texi (Minibuffer History): history-length and
history-delete-duplicates are options.
(High-Level Completion): read-buffer-function and
read-buffer-completion-ignore-case are options.
(Reading File Names): read-file-name-completion-ignore-case is
an option.

* modes.texi (Mode Line Top): mode-line-format is an option.
(Mode Line Variables): mode-line-position and mode-line-modes
are options.

* nonascii.texi (Text Representations):
enable-multibyte-characters is an option.
(Default Coding Systems): auto-coding-regexp-alist,
file-coding-system-alist, auto-coding-alist and
auto-coding-functions are options.
(Specifying Coding Systems): inhibit-eol-conversion is an
option.

* os.texi (Init File): site-run-file is an option.
(System Environment): mail-host-address is an option.
(User Identification): user-mail-address is an option.
(Terminal Output): baud-rate is an option.

* positions.texi (Word Motion): words-include-escapes is an
option.

* searching.texi (Standard Regexps): page-delimiter,
paragraph-separate, paragraph-separate and sentence-end are
options.

* text.texi (Margins): left-margin and fill-nobreak-predicate
are options.

* variables.texi (Local Variables): max-specpdl-size is an
option.

* windows.texi (Choosing Window):
split-window-preferred-function, special-display-function and
display-buffer-function are options.

1 files changed, 14 insertions, 14 deletions

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index d1370ad257..548e6e8e50 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -398,7 +398,7 @@ parameter values to frames that will be created henceforth.
 You can specify the parameters for the initial startup frame
 by setting @code{initial-frame-alist} in your init file (@pxref{Init File}).
 
-@defvar initial-frame-alist
+@defopt initial-frame-alist
 This variable's value is an alist of parameter values used when creating
 the initial window frame.  You can set this variable to specify the
 appearance of the initial frame without altering subsequent frames.
@@ -426,27 +426,27 @@ this.  Specify parameters in @code{default-frame-alist} to override the
 X resources for subsequent frames; then, to prevent these from affecting
 the initial frame, specify the same parameters in
 @code{initial-frame-alist} with values that match the X resources.
-@end defvar
+@end defopt
 
 If these parameters specify a separate minibuffer-only frame with
 @code{(minibuffer . nil)}, and you have not created one, Emacs creates
 one for you.
 
-@defvar minibuffer-frame-alist
+@defopt minibuffer-frame-alist
 This variable's value is an alist of parameter values used when
 creating an initial minibuffer-only frame.  This is the
 minibuffer-only frame that Emacs creates if @code{initial-frame-alist}
 specifies a frame with no minibuffer.
-@end defvar
+@end defopt
 
-@defvar default-frame-alist
+@defopt default-frame-alist
 This is an alist specifying default values of frame parameters for all
 Emacs frames---the first frame, and subsequent frames.  When using the X
 Window System, you can get the same results by means of X resources
 in many cases.
 
 Setting this variable does not affect existing frames.
-@end defvar
+@end defopt
 
 Functions that display a buffer in a separate frame can override the
 default parameters by supplying their own parameters.  @xref{Definition
@@ -793,7 +793,7 @@ The buffer-local variable @code{cursor-type} overrides the value of
 the @code{cursor-type} frame parameter, but if it is @code{t}, that
 means to use the cursor specified for the frame.
 
-@defvar blink-cursor-alist
+@defopt blink-cursor-alist
 This variable specifies how to blink the cursor.  Each element has the
 form @code{(@var{on-state} . @var{off-state})}.  Whenever the cursor
 type equals @var{on-state} (comparing using @code{equal}), the
@@ -805,16 +805,16 @@ There are various defaults for how to blink each type of cursor, if
 the type is not mentioned as an @var{on-state} here.  Changes in this
 variable do not take effect immediately, only when you specify the
 @code{cursor-type} frame parameter.
-@end defvar
+@end defopt
 
-@defvar cursor-in-non-selected-windows
+@defopt cursor-in-non-selected-windows
 This variable controls how the cursor looks in a window that is not
 selected.  It supports the same values as the @code{cursor-type} frame
 parameter; also, @code{nil} means don't display a cursor in
 nonselected windows, and @code{t} (the default) means use a standard
 modificatoin of the usual cursor type (solid box becomes hollow box,
 and bar becomes a narrower bar).
-@end defvar
+@end defopt
 
 @node Font and Color Parameters
 @subsubsection Font and Color Parameters
@@ -1926,12 +1926,12 @@ the first cut buffer moves into the second cut buffer, and the second to
 the third, and so on through all eight cut buffers.
 @end defun
 
-@defvar selection-coding-system
+@defopt selection-coding-system
 This variable specifies the coding system to use when reading and
 writing selections or the clipboard.  @xref{Coding
 Systems}.  The default is @code{compound-text-with-extensions}, which
 converts to the text representation that X11 normally uses.
-@end defvar
+@end defopt
 
 @cindex clipboard support (for MS-Windows)
 When Emacs runs on MS-Windows, it does not implement X selections in
@@ -2327,11 +2327,11 @@ This function returns the width of the screen in millimeters,
 or @code{nil} if Emacs cannot get that information.
 @end defun
 
-@defvar display-mm-dimensions-alist
+@defopt display-mm-dimensions-alist
 This variable allows the user to specify the dimensions of graphical
 displays returned by @code{display-mm-height} and
 @code{display-mm-width} in case the system provides incorrect values.
-@end defvar
+@end defopt
 
 @defun display-backing-store &optional display
 This function returns the backing store capability of the display.