aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2018-11-24 10:00:55 +0200
committerEli Zaretskii2018-11-24 10:00:55 +0200
commit56e3e4fe6816b5f13c410300e2bf5a0c1fcbe03a (patch)
treeeb1dca12aba57cf175390bb9caf3a2209bdee23a
parent7a4992a0d392843c0f13709a575a08ecaf56b51c (diff)
downloademacs-56e3e4fe6816b5f13c410300e2bf5a0c1fcbe03a.tar.gz
emacs-56e3e4fe6816b5f13c410300e2bf5a0c1fcbe03a.zip
Improve indexing in the ELisp manual
* doc/lispref/control.texi (Control Structures, Sequencing) (Conditionals, Iteration, Catch and Throw, Handling Errors) (Cleanups): * doc/lispref/eval.texi (Self-Evaluating Forms) (Symbol Forms, Function Forms, Macro Forms, Special Forms) (Quoting, Backquote): Add index entries that begin with "forms". (Bug#33440)
-rw-r--r--doc/lispref/control.texi7
-rw-r--r--doc/lispref/eval.texi9
2 files changed, 16 insertions, 0 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 8989b7de91b..4e5422aaa70 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -6,6 +6,7 @@
6@node Control Structures 6@node Control Structures
7@chapter Control Structures 7@chapter Control Structures
8@cindex special forms for control structures 8@cindex special forms for control structures
9@cindex forms for control structures
9@cindex control structures 10@cindex control structures
10 11
11 A Lisp program consists of a set of @dfn{expressions}, or 12 A Lisp program consists of a set of @dfn{expressions}, or
@@ -48,6 +49,7 @@ structure constructs (@pxref{Macros}).
48@section Sequencing 49@section Sequencing
49@cindex sequencing 50@cindex sequencing
50@cindex sequential execution 51@cindex sequential execution
52@cindex forms for sequential execution
51 53
52 Evaluating forms in the order they appear is the most common way 54 Evaluating forms in the order they appear is the most common way
53control passes from one form to another. In some contexts, such as in a 55control passes from one form to another. In some contexts, such as in a
@@ -146,6 +148,7 @@ following @var{forms}, in textual order, returning the result of
146@node Conditionals 148@node Conditionals
147@section Conditionals 149@section Conditionals
148@cindex conditional evaluation 150@cindex conditional evaluation
151@cindex forms, conditional
149 152
150 Conditional control structures choose among alternatives. Emacs Lisp 153 Conditional control structures choose among alternatives. Emacs Lisp
151has five conditional forms: @code{if}, which is much the same as in 154has five conditional forms: @code{if}, which is much the same as in
@@ -1273,6 +1276,7 @@ up being equivalent to @code{dolist} (@pxref{Iteration}).
1273@section Iteration 1276@section Iteration
1274@cindex iteration 1277@cindex iteration
1275@cindex recursion 1278@cindex recursion
1279@cindex forms, iteration
1276 1280
1277 Iteration means executing part of a program repetitively. For 1281 Iteration means executing part of a program repetitively. For
1278example, you might want to repeat some computation once for each element 1282example, you might want to repeat some computation once for each element
@@ -1496,6 +1500,7 @@ exited.
1496 1500
1497@node Catch and Throw 1501@node Catch and Throw
1498@subsection Explicit Nonlocal Exits: @code{catch} and @code{throw} 1502@subsection Explicit Nonlocal Exits: @code{catch} and @code{throw}
1503@cindex forms for nonlocal exits
1499 1504
1500 Most control constructs affect only the flow of control within the 1505 Most control constructs affect only the flow of control within the
1501construct itself. The function @code{throw} is the exception to this 1506construct itself. The function @code{throw} is the exception to this
@@ -1867,6 +1872,7 @@ variables precisely as they were at the time of the error.
1867@subsubsection Writing Code to Handle Errors 1872@subsubsection Writing Code to Handle Errors
1868@cindex error handler 1873@cindex error handler
1869@cindex handling errors 1874@cindex handling errors
1875@cindex forms for handling errors
1870 1876
1871 The usual effect of signaling an error is to terminate the command 1877 The usual effect of signaling an error is to terminate the command
1872that is running and return immediately to the Emacs editor command loop. 1878that is running and return immediately to the Emacs editor command loop.
@@ -2235,6 +2241,7 @@ and their conditions.
2235@node Cleanups 2241@node Cleanups
2236@subsection Cleaning Up from Nonlocal Exits 2242@subsection Cleaning Up from Nonlocal Exits
2237@cindex nonlocal exits, cleaning up 2243@cindex nonlocal exits, cleaning up
2244@cindex forms for cleanup
2238 2245
2239 The @code{unwind-protect} construct is essential whenever you 2246 The @code{unwind-protect} construct is essential whenever you
2240temporarily put a data structure in an inconsistent state; it permits 2247temporarily put a data structure in an inconsistent state; it permits
diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi
index 373b12e79d5..416815e1900 100644
--- a/doc/lispref/eval.texi
+++ b/doc/lispref/eval.texi
@@ -127,6 +127,7 @@ with the other types, which are self-evaluating forms.
127@cindex vector evaluation 127@cindex vector evaluation
128@cindex literal evaluation 128@cindex literal evaluation
129@cindex self-evaluating form 129@cindex self-evaluating form
130@cindex form, self-evaluating
130 131
131 A @dfn{self-evaluating form} is any form that is not a list or 132 A @dfn{self-evaluating form} is any form that is not a list or
132symbol. Self-evaluating forms evaluate to themselves: the result of 133symbol. Self-evaluating forms evaluate to themselves: the result of
@@ -179,6 +180,8 @@ program. Here is an example:
179@node Symbol Forms 180@node Symbol Forms
180@subsection Symbol Forms 181@subsection Symbol Forms
181@cindex symbol evaluation 182@cindex symbol evaluation
183@cindex symbol forms
184@cindex forms, symbol
182 185
183 When a symbol is evaluated, it is treated as a variable. The result 186 When a symbol is evaluated, it is treated as a variable. The result
184is the variable's value, if it has one. If the symbol has no value as 187is the variable's value, if it has one. If the symbol has no value as
@@ -215,6 +218,7 @@ its value ordinarily cannot be changed. @xref{Constant Variables}.
215@node Classifying Lists 218@node Classifying Lists
216@subsection Classification of List Forms 219@subsection Classification of List Forms
217@cindex list form evaluation 220@cindex list form evaluation
221@cindex forms, list
218 222
219 A form that is a nonempty list is either a function call, a macro 223 A form that is a nonempty list is either a function call, a macro
220call, or a special form, according to its first element. These three 224call, or a special form, according to its first element. These three
@@ -349,6 +353,7 @@ Here is how you could define @code{indirect-function} in Lisp:
349@subsection Evaluation of Function Forms 353@subsection Evaluation of Function Forms
350@cindex function form evaluation 354@cindex function form evaluation
351@cindex function call 355@cindex function call
356@cindex forms, function call
352 357
353 If the first element of a list being evaluated is a Lisp function 358 If the first element of a list being evaluated is a Lisp function
354object, byte-code object or primitive function object, then that list is 359object, byte-code object or primitive function object, then that list is
@@ -372,6 +377,7 @@ body form becomes the value of the function call.
372@node Macro Forms 377@node Macro Forms
373@subsection Lisp Macro Evaluation 378@subsection Lisp Macro Evaluation
374@cindex macro call evaluation 379@cindex macro call evaluation
380@cindex forms, macro call
375 381
376 If the first element of a list being evaluated is a macro object, then 382 If the first element of a list being evaluated is a macro object, then
377the list is a @dfn{macro call}. When a macro call is evaluated, the 383the list is a @dfn{macro call}. When a macro call is evaluated, the
@@ -418,6 +424,7 @@ expansion.
418@node Special Forms 424@node Special Forms
419@subsection Special Forms 425@subsection Special Forms
420@cindex special forms 426@cindex special forms
427@cindex forms, special
421@cindex evaluation of special forms 428@cindex evaluation of special forms
422 429
423 A @dfn{special form} is a primitive function specially marked so that 430 A @dfn{special form} is a primitive function specially marked so that
@@ -539,6 +546,7 @@ described in @ref{Autoload}.
539 546
540@node Quoting 547@node Quoting
541@section Quoting 548@section Quoting
549@cindex forms, quote
542 550
543 The special form @code{quote} returns its single argument, as written, 551 The special form @code{quote} returns its single argument, as written,
544without evaluating it. This provides a way to include constant symbols 552without evaluating it. This provides a way to include constant symbols
@@ -598,6 +606,7 @@ only part of a list, while computing and substituting other parts.
598@cindex backquote (list substitution) 606@cindex backquote (list substitution)
599@cindex ` (list substitution) 607@cindex ` (list substitution)
600@findex ` 608@findex `
609@cindex forms, backquote
601 610
602 @dfn{Backquote constructs} allow you to quote a list, but 611 @dfn{Backquote constructs} allow you to quote a list, but
603selectively evaluate elements of that list. In the simplest case, it 612selectively evaluate elements of that list. In the simplest case, it