summaryrefslogtreecommitdiff
path: root/doc/lispref
diff options
context:
space:
mode:
authorVibhav Pant <vibhavp@gmail.com>2020-08-21 14:04:35 +0530
committerVibhav Pant <vibhavp@gmail.com>2020-08-21 14:04:35 +0530
commitf0f8d7b82492e741950c363a03b886965c91b1b0 (patch)
tree19b716830b1ebabc0d7d75949c4e6800c0f104ad /doc/lispref
parent9e64a087c4d167e7ec1c4e22bea3e6af53b563de (diff)
parentc818c29771d3cb51875643b2f6c894073e429dd2 (diff)
downloademacs-feature/native-comp-macos-fixes.tar.gz
Merge branch 'feature/native-comp' into feature/native-comp-macos-fixesfeature/native-comp-macos-fixes
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/commands.texi7
-rw-r--r--doc/lispref/functions.texi9
-rw-r--r--doc/lispref/searching.texi2
-rw-r--r--doc/lispref/sequences.texi6
-rw-r--r--doc/lispref/tips.texi2
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
event comes either before or after the multi-event key sequence, not
within it.
+ Some of these special events, such as @code{delete-frame}, invoke
+Emacs commands by default; others are not bound. If you want to
+arrange for a special event to invoke a command, you can do that via
+@code{special-event-map}. The command you bind to a function key in
+that map can then examine the full event which invoked it in
+@code{last-input-event}. @xref{Special Events}.
+
@node Event Examples
@subsection Event Examples
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
other lists, intended for other uses, will not accidentally be valid as
functions.
- The second element is a list of symbols---the argument variable names.
+ The second element is a list of symbols---the argument variable
+names (@pxref{Argument List}).
This is called the @dfn{lambda list}. When a Lisp function is called,
the argument values are matched up against the variables in the lambda
list, which are given local bindings with the values provided.
@@ -342,7 +343,7 @@ stored as symbol function definitions to produce named functions
(@pxref{Function Names}).
@node Argument List
-@subsection Other Features of Argument Lists
+@subsection Features of Argument Lists
@kindex wrong-number-of-arguments
@cindex argument binding
@cindex binding arguments
@@ -583,8 +584,8 @@ a function.
@defmac defun name args [doc] [declare] [interactive] body@dots{}
@code{defun} is the usual way to define new Lisp functions. It
defines the symbol @var{name} as a function with argument list
-@var{args} and body forms given by @var{body}. Neither @var{name} nor
-@var{args} should be quoted.
+@var{args} (@pxref{Argument List}) and body forms given by @var{body}.
+Neither @var{name} nor @var{args} should be quoted.
@var{doc}, if present, should be a string specifying the function's
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.
long time, if they lead to ambiguous matching. For
example, trying to match the regular expression @samp{\(x+y*\)*a}
against the string @samp{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz} could
-take hours before it ultimately fails. Emacs must try each way of
+take hours before it ultimately fails. Emacs may try each way of
grouping the @samp{x}s before concluding that none of them can work.
In general, avoid expressions that can match the same string in
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}.
@example
@group
-(seq-contains '(symbol1 symbol2) 'symbol1)
-@result{} symbol1
+(seq-contains-p '(symbol1 symbol2) 'symbol1)
+@result{} t
@end group
@group
-(seq-contains '(symbol1 symbol2) 'symbol3)
+(seq-contains-p '(symbol1 symbol2) 'symbol3)
@result{} nil
@end group
@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
approach for a long time, many people have chosen to use multiple
top-level code sections instead. You may chose either style.
-Using multiple top-level code sections has the advanatage that it
+Using multiple top-level code sections has the advantage that it
avoids introducing an additional nesting level but it also means that
the section named @samp{Code} does not contain all the code, which is
awkward. To avoid that, you should put no code at all inside that