aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2004-08-08 15:47:21 +0000
committerLuc Teirlinck2004-08-08 15:47:21 +0000
commitde700726fb364cf5b6107501b392d96cac641df2 (patch)
tree546150828288e363ed4a1eb2d499f96b5d0d7069
parent81909a1aef80ec199c646f488da81fa48d1417af (diff)
downloademacs-de700726fb364cf5b6107501b392d96cac641df2.tar.gz
emacs-de700726fb364cf5b6107501b392d96cac641df2.zip
(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'.
-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 b046727f2f9..f8abc8e2c11 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,12 @@
12004-08-08 Luc Teirlinck <teirllm@auburn.edu>
2
3 * hooks.texi (Standard Hooks): `disabled-command-hook' has been
4 renamed to `disabled-command-function'.
5 * commands.texi (Key Sequence Input): Remove unnecessary anchor,
6 (Command Loop Info): Replace reference to it.
7 (Disabling Commands): `disabled-command-hook' has been renamed to
8 `disabled-command-function'.
9
12004-08-07 Luc Teirlinck <teirllm@auburn.edu> 102004-08-07 Luc Teirlinck <teirllm@auburn.edu>
2 11
3 * os.texi (Translating Input): Only non-prefix bindings in 12 * os.texi (Translating Input): Only non-prefix bindings in
diff --git a/lispref/commands.texi b/lispref/commands.texi
index d568805d6be..796fc45f5f3 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -750,9 +750,9 @@ This function returns a string or vector containing the key sequence
750that invoked the present command, plus any previous commands that 750that invoked the present command, plus any previous commands that
751generated the prefix argument for this command. However, if the 751generated the prefix argument for this command. However, if the
752command has called @code{read-key-sequence}, it returns the last read 752command has called @code{read-key-sequence}, it returns the last read
753key sequence. @xref{Definition of read-key-sequence}. The value is a 753key sequence. @xref{Key Sequence Input}. The value is a string if
754string if all events in the sequence were characters that fit in a 754all events in the sequence were characters that fit in a string.
755string. @xref{Input Events}. 755@xref{Input Events}.
756 756
757@example 757@example
758@group 758@group
@@ -2019,7 +2019,6 @@ for example, @code{describe-key} uses it to read the key to describe.
2019 2019
2020@defun read-key-sequence prompt 2020@defun read-key-sequence prompt
2021@cindex key sequence 2021@cindex key sequence
2022@anchor{Definition of read-key-sequence}
2023This function reads a key sequence and returns it as a string or 2022This function reads a key sequence and returns it as a string or
2024vector. It keeps reading events until it has accumulated a complete key 2023vector. It keeps reading events until it has accumulated a complete key
2025sequence; that is, enough to specify a non-prefix command using the 2024sequence; 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
2906alter the user's init file so that this will apply to future sessions. 2905alter the user's init file so that this will apply to future sessions.
2907@end deffn 2906@end deffn
2908 2907
2909@defvar disabled-command-hook 2908@defvar disabled-command-function
2910When the user invokes a disabled command interactively, this normal hook 2909The value of this variable should be a function. When the user
2911is run instead of the disabled command. The hook functions can use 2910invokes a disabled command interactively, this function is called
2912@code{this-command-keys} to determine what the user typed to run the 2911instead of the disabled command. It can use @code{this-command-keys}
2913command, and thus find the command itself. @xref{Hooks}. 2912to determine what the user typed to run the command, and thus find the
2913command itself.
2914 2914
2915By default, @code{disabled-command-hook} contains a function that asks 2915The value may also be @code{nil}. Then all commands work normally,
2916the user whether to proceed. If the value is @code{nil}, then all 2916even disabled ones.
2917commands work normally, even disabled ones. 2917
2918By default, the value is a function that asks the user whether to
2919proceed.
2918@end defvar 2920@end defvar
2919 2921
2920@node Command History 2922@node Command History