[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 87811b4 5/5: Merge from origin/emacs-27
From: |
Glenn Morris |
Subject: |
master 87811b4 5/5: Merge from origin/emacs-27 |
Date: |
Thu, 13 Aug 2020 11:28:48 -0400 (EDT) |
branch: master
commit 87811b4fe18ea9884da96c225d63ffcb9a7016d4
Merge: 7b63844 6956867
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
Merge from origin/emacs-27
69568674b3 (origin/emacs-27) Improve documentation of function argume...
1c0bc1ccd8 Improve documentation of special events
---
doc/lispref/commands.texi | 7 +++++++
doc/lispref/functions.texi | 9 +++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index d25f009..25f6574 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 bc8ec0e..2898cb4 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},