summaryrefslogtreecommitdiff
path: root/lispref
diff options
context:
space:
mode:
authorLuc Teirlinck <teirllm@auburn.edu>2004-08-08 15:47:21 +0000
committerLuc Teirlinck <teirllm@auburn.edu>2004-08-08 15:47:21 +0000
commitde700726fb364cf5b6107501b392d96cac641df2 (patch)
tree546150828288e363ed4a1eb2d499f96b5d0d7069 /lispref
parent81909a1aef80ec199c646f488da81fa48d1417af (diff)
(Key Sequence Input): Remove unnecessary anchor,
(Command Loop Info): Replace reference to it. (Disabling Commands): `disabled-command-hook' has been renamed to `disabled-command-function'.
Diffstat (limited to 'lispref')
-rw-r--r--lispref/ChangeLog9
-rw-r--r--lispref/commands.texi26
2 files changed, 23 insertions, 12 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index b046727f2f..f8abc8e2c1 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-08 Luc Teirlinck <teirllm@auburn.edu>
+
+ * hooks.texi (Standard Hooks): `disabled-command-hook' has been
+ renamed to `disabled-command-function'.
+ * commands.texi (Key Sequence Input): Remove unnecessary anchor,
+ (Command Loop Info): Replace reference to it.
+ (Disabling Commands): `disabled-command-hook' has been renamed to
+ `disabled-command-function'.
+
2004-08-07 Luc Teirlinck <teirllm@auburn.edu>
* os.texi (Translating Input): Only non-prefix bindings in
diff --git a/lispref/commands.texi b/lispref/commands.texi
index d568805d6b..796fc45f5f 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -750,9 +750,9 @@ This function returns a string or vector containing the key sequence
that invoked the present command, plus any previous commands that
generated the prefix argument for this command. However, if the
command has called @code{read-key-sequence}, it returns the last read
-key sequence. @xref{Definition of read-key-sequence}. The value is a
-string if all events in the sequence were characters that fit in a
-string. @xref{Input Events}.
+key sequence. @xref{Key Sequence Input}. The value is a string if
+all events in the sequence were characters that fit in a string.
+@xref{Input Events}.
@example
@group
@@ -2019,7 +2019,6 @@ for example, @code{describe-key} uses it to read the key to describe.
@defun read-key-sequence prompt
@cindex key sequence
-@anchor{Definition of read-key-sequence}
This function reads a key sequence and returns it as a string or
vector. It keeps reading events until it has accumulated a complete key
sequence; that is, enough to specify a non-prefix command using the
@@ -2906,15 +2905,18 @@ Require special confirmation to execute @var{command} from now on, and
alter the user's init file so that this will apply to future sessions.
@end deffn
-@defvar disabled-command-hook
-When the user invokes a disabled command interactively, this normal hook
-is run instead of the disabled command. The hook functions can use
-@code{this-command-keys} to determine what the user typed to run the
-command, and thus find the command itself. @xref{Hooks}.
+@defvar disabled-command-function
+The value of this variable should be a function. When the user
+invokes a disabled command interactively, this function is called
+instead of the disabled command. It can use @code{this-command-keys}
+to determine what the user typed to run the command, and thus find the
+command itself.
-By default, @code{disabled-command-hook} contains a function that asks
-the user whether to proceed. If the value is @code{nil}, then all
-commands work normally, even disabled ones.
+The value may also be @code{nil}. Then all commands work normally,
+even disabled ones.
+
+By default, the value is a function that asks the user whether to
+proceed.
@end defvar
@node Command History