Commit 41b7f8bc authored by Chong Yidong's avatar Chong Yidong

Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org

parents 82a25657 05c44a75
2012-06-11 Chong Yidong <cyd@gnu.org>
* emacs.texi: Remove urlcolor setting.
2012-06-10 Chong Yidong <cyd@gnu.org>
* emacs.texi: Update ISBN and edition number.
* anti.texi:
* building.texi:
* cmdargs.texi:
* custom.texi:
* display.texi:
* files.texi:
* frames.texi:
* glossary.texi:
* misc.texi:
* mule.texi:
* programs.texi:
* sending.texi:
* text.texi: Copyedits to avoid underfull/overfull in 7x9 manual.
2012-06-06 Michael Albinus <michael.albinus@gmx.de>
* custom.texi (Directory Variables): Mention enable-remote-dir-locals.
......
......@@ -63,19 +63,18 @@ string (@code{isearch-yank-line}), whereas @kbd{M-y} does
@kbd{C-y} and @kbd{M-y} is unintended.
@item
Various completion features have been simplified. The options
@code{completion-cycle-threshold} and
@code{completion-category-overrides} have been removed. Due to the
latter removal, Emacs uses a single consistent scheme to generate
completions, instead of using a separate scheme for (say) buffer name
completion. Several major modes, such as Shell mode, now implement
their own inline completion commands instead of using
@code{completion-at-point}.
Various completion features have been simplified. The option
@code{completion-category-overrides} has been removed, so Emacs uses a
single consistent scheme to generate completions, instead of using a
separate scheme for (say) buffer name completion. Several major
modes, such as Shell mode, now implement their own inline completion
commands instead of using @code{completion-at-point}.
@item
We have removed various options for controlling how windows are used,
e.g.@: @code{display-buffer-base-action}, @code{display-buffer-alist},
@code{window-combination-limit}, and @code{window-combination-resize}.
We have removed several options for controlling how windows are used,
such as @code{display-buffer-base-action},
@code{display-buffer-alist}, @code{window-combination-limit}, and
@code{window-combination-resize}.
@item
The command @kbd{M-x customize-themes} has been removed. Emacs no
......
......@@ -426,11 +426,11 @@ syntax checking tool used depends on the language; for example, for
C/C++ files this is usually the C compiler. Flymake can also use
build tools such as @code{make} for checking complicated projects.
To enable Flymake mode, type @kbd{M-x flymake-mode}. You can jump to
the errors that it finds by using @kbd{M-x
flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}.
Use the command @kbd{M-x flymake-display-err-menu-for-current-line}
to display any error messages associated with the current line.
To enable Flymake mode, type @kbd{M-x flymake-mode}. You can jump
to the errors that it finds by using @kbd{M-x flymake-goto-next-error}
and @kbd{M-x flymake-goto-prev-error}. To display any error messages
associated with the current line, type @kbd{M-x
flymake-display-err-menu-for-current-line}.
For more details about using Flymake,
@ifnottex
......@@ -1495,7 +1495,7 @@ eval-buffer} is similar but evaluates the entire buffer.
@vindex eval-expression-print-level
@vindex eval-expression-print-length
@vindex eval-expression-debug-on-error
The customizable variables @code{eval-expression-print-level} and
The options @code{eval-expression-print-level} and
@code{eval-expression-print-length} control the maximum depth and
length of lists to print in the result of the evaluation commands
before abbreviating them. @code{eval-expression-debug-on-error}
......
......@@ -245,10 +245,10 @@ Scroll calendar one month forward (@code{calendar-scroll-left}).
Scroll calendar one month backward (@code{calendar-scroll-right}).
@item C-v
@itemx @key{next}
Scroll three months forward (@code{calendar-scroll-left-three-months}).
Scroll forward by three months (@code{calendar-scroll-left-three-months}).
@item M-v
@itemx @key{prior}
Scroll three months backward (@code{calendar-scroll-right-three-months}).
Scroll backward by three months (@code{calendar-scroll-right-three-months}).
@end table
@kindex > @r{(Calendar mode)}
......
......@@ -436,7 +436,7 @@ Used by the @code{cd} command to search for the directory you specify,
when you specify a relative directory name.
@item EMACSDATA
Directory for the architecture-independent files that come with Emacs.
This is used to initialize the Lisp variable @code{data-directory}.
This is used to initialize the variable @code{data-directory}.
@item EMACSDOC
Directory for the documentation string file, which is used to
initialize the Lisp variable @code{doc-directory}.
......@@ -577,7 +577,8 @@ does not use @env{TZ} at all.
The user's login name. See also @env{LOGNAME}. On MS-DOS, this
defaults to @samp{root}.
@item VERSION_CONTROL
Used to initialize the @code{version-control} variable (@pxref{Backup Names}).
Used to initialize the @code{version-control} variable (@pxref{Backup
Names}).
@end table
@node Misc Variables
......
......@@ -765,16 +765,14 @@ displays something like this:
@example
fill-column is a variable defined in `C source code'.
fill-column's value is 70
Local in buffer custom.texi; global value is 70
Automatically becomes buffer-local when set in any fashion.
Automatically becomes buffer-local when set in any fashion.
This variable is safe as a file local variable if its value
satisfies the predicate `integerp'.
Automatically becomes buffer-local when set in any fashion.
This variable is safe as a file local variable if its value
satisfies the predicate `integerp'.
Documentation:
*Column beyond which automatic line-wrapping should happen.
Interactively, you can set the buffer local value using C-x f.
Column beyond which automatic line-wrapping should happen.
Interactively, you can set the local value with C-x f.
You can customize this variable.
@end example
......@@ -1054,13 +1052,14 @@ pair with a colon and semicolon. The special variable/value pair
@findex add-file-local-variable-prop-line
@findex delete-file-local-variable-prop-line
@findex copy-dir-locals-to-file-locals-prop-line
You can use the command @kbd{M-x add-file-local-variable-prop-line}
instead of adding entries by hand. It prompts for
a variable and value, and adds them to the first line in the
appropriate way. @kbd{M-x delete-file-local-variable-prop-line}
prompts for a variable, and deletes its entry from the line. @kbd{M-x
copy-dir-locals-to-file-locals-prop-line} copies directory-local
variables to the first line (@pxref{Directory Variables}).
You can use @kbd{M-x add-file-local-variable-prop-line} instead of
adding entries by hand. This command prompts for a variable and
value, and adds them to the first line in the appropriate way.
@kbd{M-x delete-file-local-variable-prop-line} prompts for a variable,
and deletes its entry from the line. The command @kbd{M-x
copy-dir-locals-to-file-locals-prop-line} copies the current
directory-local variables to the first line (@pxref{Directory
Variables}).
Here is an example first line that specifies Lisp mode and sets two
variables with numeric values:
......
......@@ -759,11 +759,10 @@ argument disables it.
@findex global-font-lock-mode
@vindex global-font-lock-mode
To toggle Font Lock mode in all buffers, type @kbd{M-x
global-font-lock-mode}. To impose this setting for future Emacs
sessions, customize the variable @code{global-font-lock-mode}
(@pxref{Easy Customization}), or add the following line to your init
file:
Type @kbd{M-x global-font-lock-mode} to toggle Font Lock mode in all
buffers. To impose this setting for future Emacs sessions, customize
the variable @code{global-font-lock-mode} (@pxref{Easy
Customization}), or add the following line to your init file:
@example
(global-font-lock-mode 0)
......
......@@ -14,7 +14,7 @@
@c be something added by the FSF during the publishing process.
@c Also, the lispref uses a float (3.0), whereas this uses an ordinal,
@c so the format is not even consistent.
@set EDITION Sixteenth
@set EDITION Seventeenth
@include emacsver.texi
@copying
......@@ -54,7 +54,7 @@ developing GNU and promoting software freedom.''
@c in general, keep the following line commented out, unless doing a
@c copy of this manual that will be published. The manual should go
@c onto the distribution in the full, 8.5 x 11" size.
@c @smallbook
@c @set smallbook
@ifset smallbook
@smallbook
......@@ -66,8 +66,6 @@ developing GNU and promoting software freedom.''
@tex
@ifset smallbook
@fonttextsize 10
\global\let\urlcolor=\Black % don't print links in grayscale
\global\let\linkcolor=\Black
@end ifset
\global\hbadness=6666 % don't worry about not-too-underfull boxes
@end tex
......@@ -96,10 +94,10 @@ developing GNU and promoting software freedom.''
Published by the Free Software Foundation @*
51 Franklin Street, Fifth Floor @*
Boston, MA 02110-1301 USA @*
ISBN 1-882114-86-8
ISBN 978-0-9831592-2-3
@sp 2
Cover art by Etienne Suvasa.
Cover art by Etienne Suvasa; cover design by Matt Lee.
@end titlepage
......
......@@ -1101,11 +1101,11 @@ recover are present in Emacs buffers. You should then save them. Only
this---saving them---updates the files themselves.
@vindex auto-save-list-file-prefix
Emacs records information about interrupted sessions for later
recovery in files named @file{.saves-@var{pid}-@var{hostname}} in the
directory @file{~/.emacs.d/auto-save-list/}. This directory is
determined by the variable @code{auto-save-list-file-prefix}. If you
set @code{auto-save-list-file-prefix} to @code{nil}, sessions are not
Emacs records information about interrupted sessions in files named
@file{.saves-@var{pid}-@var{hostname}} in the directory
@file{~/.emacs.d/auto-save-list/}. This directory is determined by
the variable @code{auto-save-list-file-prefix}. If you set
@code{auto-save-list-file-prefix} to @code{nil}, sessions are not
recorded for recovery.
@node File Aliases
......
......@@ -499,7 +499,8 @@ Add a line to your init file, modifying the variable
(@pxref{Frame Parameters}), like this:
@example
(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
(add-to-list 'default-frame-alist
'(font . "DejaVu Sans Mono-10"))
@end example
@cindex X defaults file
......
......@@ -40,8 +40,8 @@ An @acronym{ASCII} control character is the Control version of an upper-case
letter, or the Control version of one of the characters @samp{@@[\]^_?}.
@item @acronym{ASCII} printing character
@acronym{ASCII} printing characters include letters, digits, space, and these
punctuation characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}.
@acronym{ASCII} letters, digits, space, and the following punctuation
characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}.
@item Auto Fill Mode
Auto Fill mode is a minor mode (q.v.@:) in which text that you insert is
......
......@@ -903,11 +903,11 @@ Display the changes that will be sent by the next push operation
@kindex C-x v l
@findex vc-print-log
The command @kbd{C-x v l} (@code{vc-print-log}) displays a buffer
named @file{*vc-change-log*}, showing the history of changes made to
the current file, including who made the changes, the dates, and the
log entry for each change (these are the same log entries you would
enter via the @file{*vc-log*} buffer; @pxref{Log Buffer}). Point is
@kbd{C-x v l} (@code{vc-print-log}) displays a buffer named
@file{*vc-change-log*}, showing the history of changes made to the
current file, including who made the changes, the dates, and the log
entry for each change (these are the same log entries you would enter
via the @file{*vc-log*} buffer; @pxref{Log Buffer}). Point is
centered at the revision of the file currently being visited. With a
prefix argument, the command prompts for the revision to center on,
and the maximum number of revisions to display.
......
......@@ -2257,18 +2257,18 @@ editors. Standard facilities can emulate these:
@cindex Brief emulation
@cindex emulation of Brief
@cindex mode, CRiSP
You can turn on key bindings to emulate the CRiSP/Brief editor with
@kbd{M-x crisp-mode}. Note that this rebinds @kbd{M-x} to exit Emacs
unless you set the variable @code{crisp-override-meta-x}. You can
also use the command @kbd{M-x scroll-all-mode} or set the variable
@kbd{M-x crisp-mode} enables key bindings to emulate the CRiSP/Brief
editor. Note that this rebinds @kbd{M-x} to exit Emacs unless you set
the variable @code{crisp-override-meta-x}. You can also use the
command @kbd{M-x scroll-all-mode} or set the variable
@code{crisp-load-scroll-all} to emulate CRiSP's scroll-all feature
(scrolling all windows together).
@item EDT (DEC VMS editor)
@findex edt-emulation-on
@findex edt-emulation-off
Turn on EDT emulation @kbd{M-x edt-emulation-on}; use @kbd{M-x
edt-emulation-off} to restore normal Emacs command bindings.
Turn on EDT emulation with @kbd{M-x edt-emulation-on}; restore normal
command bindings with @kbd{M-x edt-emulation-off}.
Most of the EDT emulation commands are keypad keys, and most standard
Emacs key bindings are still available. The EDT emulation rebindings
......@@ -2454,7 +2454,7 @@ point (@code{dired-at-point}).
@code{ffap-read-only-other-window}, analogous to
@code{find-file-read-only-other-window}.
@item C-x 4 d
@code{ffap-dired-other-window}, analogous to @code{dired-other-window}.
@code{ffap-dired-other-window}, like @code{dired-other-window}.
@item C-x 5 f
@kindex C-x 5 f @r{(FFAP)}
@code{ffap-other-frame}, analogous to @code{find-file-other-frame}.
......@@ -2481,8 +2481,8 @@ find the one you select (@code{ffap-menu}).
@findex animate-birthday-present
@cindex animate
The @code{animate} package makes text dance (e.g. try
@kbd{M-x animate-birthday-present}).
The @code{animate} package makes text dance (e.g. @kbd{M-x
animate-birthday-present}).
@findex blackbox
@findex mpuz
......
......@@ -415,16 +415,15 @@ names, which might cause misalignment of columns in Dired display.
@section HOME and Startup Directories on MS-Windows
@cindex @code{HOME} directory on MS-Windows
The Windows equivalent of the @code{HOME} directory is the
@dfn{user-specific application data directory}. The actual location
depends on the Windows version; typical values are @file{C:\Documents
and Settings\@var{username}\Application Data} on Windows 2K/XP/2K3,
@file{C:\Users\@var{username}\AppData\Roaming} on Windows Vista/7/2K8,
and either @file{C:\WINDOWS\Application Data} or
@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on the
older Windows 9X/ME systems. If this directory does not exist or
cannot be accessed, Emacs falls back to @file{C:\} as the default
value of @code{HOME}.
The Windows equivalent of @code{HOME} is the @dfn{user-specific
application data directory}. The actual location depends on the
Windows version; typical values are @file{C:\Documents and
Settings\@var{username}\Application Data} on Windows 2000/XP/2K3,
@file{C:\Users\@var{username}\AppData\Roaming} on Windows
Vista/7/2008, and either @file{C:\WINDOWS\Application Data} or
@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on Windows
9X/ME. If this directory does not exist or cannot be accessed, Emacs
falls back to @file{C:\} as the default value of @code{HOME}.
You can override this default value of @code{HOME} by explicitly
setting the environment variable @env{HOME} to point to any directory
......
......@@ -1111,11 +1111,11 @@ in communication with other processes.
@table @kbd
@item C-x @key{RET} x @var{coding} @key{RET}
Use coding system @var{coding} for transferring selections to and from
other window-based applications (@code{set-selection-coding-system}).
other graphical applications (@code{set-selection-coding-system}).
@item C-x @key{RET} X @var{coding} @key{RET}
Use coding system @var{coding} for transferring @emph{one}
selection---the next one---to or from another window-based application
selection---the next one---to or from another graphical application
(@code{set-next-selection-coding-system}).
@item C-x @key{RET} p @var{input-coding} @key{RET} @var{output-coding} @key{RET}
......
......@@ -1651,7 +1651,8 @@ the keymap is loaded before we try to change it.
@example
(defun my-bind-clb ()
(define-key c-mode-base-map "\C-j" 'c-context-line-break))
(define-key c-mode-base-map "\C-j"
'c-context-line-break))
(add-hook 'c-initialization-hook 'my-bind-clb)
@end example
......
......@@ -74,8 +74,8 @@ CC: mongol.soldier@@example.net, rms@@gnu.org
Subject: Re: What is best in life?
From: conan@@example.org
--text follows this line--
To crush your enemies, see them driven before you, and to hear the
lamentation of their women.
To crush your enemies, see them driven before you, and to
hear the lamentation of their women.
@end example
@noindent
......
......@@ -1015,11 +1015,11 @@ Both accept numeric arguments as repeat counts.
@kindex C-c C-f @r{(Outline mode)}
@kindex C-c C-b @r{(Outline mode)}
@kindex C-c C-u @r{(Outline mode)}
The commands @kbd{C-c C-f} (@code{outline-forward-same-level}) and
@kbd{C-c C-b} (@code{outline-backward-same-level}) move from one
heading line to another visible heading at the same depth in the
outline. @kbd{C-c C-u} (@code{outline-up-heading}) moves backward to
another heading that is less deeply nested.
@kbd{C-c C-f} (@code{outline-forward-same-level}) and @kbd{C-c C-b}
(@code{outline-backward-same-level}) move from one heading line to
another visible heading at the same depth in the outline. @kbd{C-c
C-u} (@code{outline-up-heading}) moves backward to another heading
that is less deeply nested.
@node Outline Visibility
@subsection Outline Visibility Commands
......@@ -2311,8 +2311,7 @@ hides text), and @code{intangible} (which disallows moving point
within the text). The @samp{Remove Special} menu item removes all of
these special properties from the text in the region.
The @code{invisible} and @code{intangible} properties are not saved
in the @samp{text/enriched} format.
The @code{invisible} and @code{intangible} properties are not saved.
@node Text Based Tables
@section Editing Text-based Tables
......@@ -2345,8 +2344,8 @@ large to fit in the cell. You can use the commands defined in the
following sections for navigating and editing the table layout.
@findex table-fixed-width-mode
To toggle the automatic table resizing feature, type @kbd{M-x
table-fixed-width-mode}.
Type @kbd{M-x table-fixed-width-mode} to toggle the automatic table
resizing feature.
@menu
* Table Definition:: What is a text based table.
......@@ -2506,15 +2505,16 @@ result in an illegitimate cell layout.
@cindex text-based tables, splitting cells
@cindex splitting table cells
@kbd{M-x table-split-cell} splits the current cell vertically or
horizontally, prompting for the direction with the minibuffer. The
commands @kbd{M-x table-split-cell-vertically} and @kbd{M-x
table-split-cell-horizontally} split in a specific direction. When
splitting vertically, the old cell contents are automatically split
between the two new cells. When splitting horizontally, you are
prompted for how to divide the cell contents, if the cell is
non-empty; the options are @samp{split} (divide the contents at
point), @samp{left} (put all the contents in the left cell), and
@samp{right} (put all the contents in the right cell).
horizontally, prompting for the direction with the minibuffer. To
split in a specific direction, use @kbd{M-x
table-split-cell-vertically} and @kbd{M-x
table-split-cell-horizontally}. When splitting vertically, the old
cell contents are automatically split between the two new cells. When
splitting horizontally, you are prompted for how to divide the cell
contents, if the cell is non-empty; the options are @samp{split}
(divide the contents at point), @samp{left} (put all the contents in
the left cell), and @samp{right} (put all the contents in the right
cell).
The following commands enlarge or shrink a cell. By default, they
resize by one row or column; if a numeric argument is supplied, that
......
2012-06-17 Chong Yidong <cyd@gnu.org>
* elisp.texi: Remove urlcolor setting.
2012-06-17 Glenn Morris <rgm@gnu.org>
* display.texi (Face Attributes): Copyedits. Add a few cindex entries.
......
......@@ -702,7 +702,8 @@ This is done by using a customization type specification instead of a
symbol for the key.
@example
:options '("foo" ((function-item some-function) integer)
:options '("foo"
((function-item some-function) integer)
"baz")
@end example
......@@ -710,7 +711,8 @@ Many alists use lists with two elements, instead of cons cells. For
example,
@example
(defcustom list-alist '(("foo" 1) ("bar" 2) ("baz" 3))
(defcustom list-alist
'(("foo" 1) ("bar" 2) ("baz" 3))
"Each element is a list of the form (KEY VALUE).")
@end example
......@@ -718,7 +720,8 @@ example,
instead of
@example
(defcustom cons-alist '(("foo" . 1) ("bar" . 2) ("baz" . 3))
(defcustom cons-alist
'(("foo" . 1) ("bar" . 2) ("baz" . 3))
"Each element is a cons-cell (KEY . VALUE).")
@end example
......
......@@ -790,8 +790,8 @@ Its default value is a list of two functions:
@findex collapse-delayed-warnings
@findex display-delayed-warnings
@noindent
The function @code{collapse-delayed-warnings} iterates through
@code{delayed-warnings-list}, removing repeated entries. The function
The function @code{collapse-delayed-warnings} removes repeated entries
from @code{delayed-warnings-list}. The function
@code{display-delayed-warnings} calls @code{display-warning} on each
of the entries in @code{delayed-warnings-list}, in turn, and then sets
@code{delayed-warnings-list} to @code{nil}.
......@@ -2081,11 +2081,10 @@ the @code{:family} attribute (a string). @xref{Fonts,,, emacs, The
GNU Emacs Manual}.
@item :width
Relative proportionate character width, also known as the character
set width. This should be one of the symbols @code{ultra-condensed},
@code{extra-condensed}, @code{condensed}, @code{semi-condensed},
@code{normal}, @code{semi-expanded}, @code{expanded},
@code{extra-expanded}, or @code{ultra-expanded}.
Relative character width. This should be one of the symbols
@code{ultra-condensed}, @code{extra-condensed}, @code{condensed},
@code{semi-condensed}, @code{normal}, @code{semi-expanded},
@code{expanded}, @code{extra-expanded}, or @code{ultra-expanded}.
@item :height
The height of the font. In the simplest case, this is an integer in
......
......@@ -1035,10 +1035,10 @@ The current match data. @xref{Match Data}.
@item
The variables @code{last-command}, @code{this-command},
@code{last-input-event}, @code{last-command-event},
@code{last-command-event}, @code{last-input-event},
@code{last-event-frame}, @code{last-nonmenu-event}, and
@code{track-mouse}. Commands used within Edebug do not affect these
variables outside of Edebug.
@code{track-mouse}. Commands in Edebug do not affect these variables
outside of Edebug.
Executing commands within Edebug can change the key sequence that
would be returned by @code{this-command-keys}, and there is no way to
......
......@@ -61,7 +61,7 @@
@c in general, keep the following line commented out, unless doing a
@c copy of this manual that will be published. The manual should go
@c onto the distribution in the full, 8.5 x 11" size.
@c @smallbook
@c @set smallbook
@ifset volflag
@smallbook
......@@ -77,8 +77,6 @@
@tex
@ifset smallbook
@fonttextsize 10
\global\let\urlcolor=\Black % don't print links in grayscale
\global\let\linkcolor=\Black
@end ifset
\global\hbadness=6666 % don't worry about not-too-underfull boxes
@end tex
......
......@@ -2950,7 +2950,8 @@ between consecutive checks. For example:
(let ((remote-file-name-inhibit-cache
(- display-time-interval 5)))
(and (file-exists-p file)
(< 0 (nth 7 (file-attributes (file-chase-links file)))))))
(< 0 (nth 7 (file-attributes
(file-chase-links file)))))))
@end example
@end defopt
......
......@@ -1263,8 +1263,8 @@ example, byte-compiling @file{fortran.el} used to warn:
@example
In end of data:
fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not known
to be defined.
fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not
known to be defined.
@end example
In fact, @code{gud-find-c-expr} is only used in the function that
......
......@@ -448,8 +448,8 @@ override any non-@code{nil} binding in any other of the @var{maps}.
@example
(defvar help-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map (make-composed-keymap button-buffer-map
special-mode-map))
(set-keymap-parent map
(make-composed-keymap button-buffer-map special-mode-map))
... map) ... )
@end example
......@@ -1600,10 +1600,11 @@ to @code{self-insert-command}.
@end defvar
@cindex key translation function
You can use @code{input-decode-map}, @code{local-function-key-map}, or
@code{key-translation-map} for more than simple aliases, by using a
function, instead of a key sequence, as the ``translation'' of a key.
Then this function is called to compute the translation of that key.
You can use @code{input-decode-map}, @code{local-function-key-map},
and @code{key-translation-map} for more than simple aliases, by using
a function, instead of a key sequence, as the ``translation'' of a
key. Then this function is called to compute the translation of that
key.
The key translation function receives one argument, which is the prompt
that was specified in @code{read-key-sequence}---or @code{nil} if the
......
......@@ -513,9 +513,10 @@ the following:
@item Definitions for major or minor modes:
@code{define-minor-mode}, @code{define-globalized-minor-mode},
@code{define-generic-mode}, @code{easy-mmode-define-minor-mode},
@code{define-generic-mode}, @code{define-derived-mode},
@code{easy-mmode-define-minor-mode},
@code{easy-mmode-define-global-mode}, @code{define-compilation-mode},
@code{define-derived-mode}, and @code{define-global-minor-mode}.
and @code{define-global-minor-mode}.
@item Other definition types:
@code{defcustom}, @code{defgroup}, @code{defclass}
......
......@@ -338,8 +338,9 @@ problem. This macro allows us to write a ``for'' loop construct.
"Execute a simple \"for\" loop.
For example, (for i from 1 to 10 do (print i))."
(list 'let (list (list var init))
(cons 'while (cons (list '<= var final)
(append body (list (list 'inc var)))))))
(cons 'while
(cons (list '<= var final)
(append body (list (list 'inc var)))))))
@end group
@result{} for
......
......@@ -1234,8 +1234,8 @@ each calls the following function to set various variables: