diff options
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/commands.texi | 7 | ||||
| -rw-r--r-- | doc/lispref/functions.texi | 9 | ||||
| -rw-r--r-- | doc/lispref/searching.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/sequences.texi | 6 | ||||
| -rw-r--r-- | doc/lispref/tips.texi | 2 |
5 files changed, 17 insertions, 9 deletions
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index d25f0093618..25f657404f3 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi | |||
| @@ -1845,6 +1845,13 @@ is, after a prefix key---then Emacs reorders the events so that this | |||
| 1845 | event comes either before or after the multi-event key sequence, not | 1845 | event comes either before or after the multi-event key sequence, not |
| 1846 | within it. | 1846 | within it. |
| 1847 | 1847 | ||
| 1848 | Some of these special events, such as @code{delete-frame}, invoke | ||
| 1849 | Emacs commands by default; others are not bound. If you want to | ||
| 1850 | arrange for a special event to invoke a command, you can do that via | ||
| 1851 | @code{special-event-map}. The command you bind to a function key in | ||
| 1852 | that map can then examine the full event which invoked it in | ||
| 1853 | @code{last-input-event}. @xref{Special Events}. | ||
| 1854 | |||
| 1848 | @node Event Examples | 1855 | @node Event Examples |
| 1849 | @subsection Event Examples | 1856 | @subsection Event Examples |
| 1850 | 1857 | ||
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index bc8ec0ef1b0..2898cb4d2b4 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi | |||
| @@ -267,7 +267,8 @@ reason functions are defined to start with @code{lambda} is so that | |||
| 267 | other lists, intended for other uses, will not accidentally be valid as | 267 | other lists, intended for other uses, will not accidentally be valid as |
| 268 | functions. | 268 | functions. |
| 269 | 269 | ||
| 270 | The second element is a list of symbols---the argument variable names. | 270 | The second element is a list of symbols---the argument variable |
| 271 | names (@pxref{Argument List}). | ||
| 271 | This is called the @dfn{lambda list}. When a Lisp function is called, | 272 | This is called the @dfn{lambda list}. When a Lisp function is called, |
| 272 | the argument values are matched up against the variables in the lambda | 273 | the argument values are matched up against the variables in the lambda |
| 273 | list, which are given local bindings with the values provided. | 274 | list, which are given local bindings with the values provided. |
| @@ -342,7 +343,7 @@ stored as symbol function definitions to produce named functions | |||
| 342 | (@pxref{Function Names}). | 343 | (@pxref{Function Names}). |
| 343 | 344 | ||
| 344 | @node Argument List | 345 | @node Argument List |
| 345 | @subsection Other Features of Argument Lists | 346 | @subsection Features of Argument Lists |
| 346 | @kindex wrong-number-of-arguments | 347 | @kindex wrong-number-of-arguments |
| 347 | @cindex argument binding | 348 | @cindex argument binding |
| 348 | @cindex binding arguments | 349 | @cindex binding arguments |
| @@ -583,8 +584,8 @@ a function. | |||
| 583 | @defmac defun name args [doc] [declare] [interactive] body@dots{} | 584 | @defmac defun name args [doc] [declare] [interactive] body@dots{} |
| 584 | @code{defun} is the usual way to define new Lisp functions. It | 585 | @code{defun} is the usual way to define new Lisp functions. It |
| 585 | defines the symbol @var{name} as a function with argument list | 586 | defines the symbol @var{name} as a function with argument list |
| 586 | @var{args} and body forms given by @var{body}. Neither @var{name} nor | 587 | @var{args} (@pxref{Argument List}) and body forms given by @var{body}. |
| 587 | @var{args} should be quoted. | 588 | Neither @var{name} nor @var{args} should be quoted. |
| 588 | 589 | ||
| 589 | @var{doc}, if present, should be a string specifying the function's | 590 | @var{doc}, if present, should be a string specifying the function's |
| 590 | documentation string (@pxref{Function Documentation}). @var{declare}, | 591 | documentation string (@pxref{Function Documentation}). @var{declare}, |
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index c8a12bdd66b..b6242c539b7 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi | |||
| @@ -342,7 +342,7 @@ this choice, the rest of the regexp matches successfully. | |||
| 342 | long time, if they lead to ambiguous matching. For | 342 | long time, if they lead to ambiguous matching. For |
| 343 | example, trying to match the regular expression @samp{\(x+y*\)*a} | 343 | example, trying to match the regular expression @samp{\(x+y*\)*a} |
| 344 | against the string @samp{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz} could | 344 | against the string @samp{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz} could |
| 345 | take hours before it ultimately fails. Emacs must try each way of | 345 | take hours before it ultimately fails. Emacs may try each way of |
| 346 | grouping the @samp{x}s before concluding that none of them can work. | 346 | grouping the @samp{x}s before concluding that none of them can work. |
| 347 | In general, avoid expressions that can match the same string in | 347 | In general, avoid expressions that can match the same string in |
| 348 | multiple ways. | 348 | multiple ways. |
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi index 91c3049f875..ca52369bd0c 100644 --- a/doc/lispref/sequences.texi +++ b/doc/lispref/sequences.texi | |||
| @@ -791,11 +791,11 @@ use instead of the default @code{equal}. | |||
| 791 | 791 | ||
| 792 | @example | 792 | @example |
| 793 | @group | 793 | @group |
| 794 | (seq-contains '(symbol1 symbol2) 'symbol1) | 794 | (seq-contains-p '(symbol1 symbol2) 'symbol1) |
| 795 | @result{} symbol1 | 795 | @result{} t |
| 796 | @end group | 796 | @end group |
| 797 | @group | 797 | @group |
| 798 | (seq-contains '(symbol1 symbol2) 'symbol3) | 798 | (seq-contains-p '(symbol1 symbol2) 'symbol3) |
| 799 | @result{} nil | 799 | @result{} nil |
| 800 | @end group | 800 | @end group |
| 801 | @end example | 801 | @end example |
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index 6292054d306..1826e8f7b42 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi | |||
| @@ -956,7 +956,7 @@ multiple sub-sections. Even though that was the only recommended | |||
| 956 | approach for a long time, many people have chosen to use multiple | 956 | approach for a long time, many people have chosen to use multiple |
| 957 | top-level code sections instead. You may chose either style. | 957 | top-level code sections instead. You may chose either style. |
| 958 | 958 | ||
| 959 | Using multiple top-level code sections has the advanatage that it | 959 | Using multiple top-level code sections has the advantage that it |
| 960 | avoids introducing an additional nesting level but it also means that | 960 | avoids introducing an additional nesting level but it also means that |
| 961 | the section named @samp{Code} does not contain all the code, which is | 961 | the section named @samp{Code} does not contain all the code, which is |
| 962 | awkward. To avoid that, you should put no code at all inside that | 962 | awkward. To avoid that, you should put no code at all inside that |