diff options
| author | Luc Teirlinck | 2004-08-08 16:17:23 +0000 |
|---|---|---|
| committer | Luc Teirlinck | 2004-08-08 16:17:23 +0000 |
| commit | 971e4c987c646d7654232c72990ff5554a0023b9 (patch) | |
| tree | f8fda9f93d269dcd86b0233e090655bbebac3867 /src | |
| parent | 939a77610645115e16e8677aeaf35c50dd06b14f (diff) | |
| download | emacs-971e4c987c646d7654232c72990ff5554a0023b9.tar.gz emacs-971e4c987c646d7654232c72990ff5554a0023b9.zip | |
Declare Qdisabled_command_function instead of Qdisabled_command_hook.
(Fcommand_execute): Use Qdisabled_command_function instead of
Qdisabled_command_hook.
(syms_of_keyboard): Ditto.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 55802e7d30a..268d782e478 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -131,8 +131,8 @@ KBOARD the_only_kboard; | |||
| 131 | #endif | 131 | #endif |
| 132 | 132 | ||
| 133 | /* Non-nil disable property on a command means | 133 | /* Non-nil disable property on a command means |
| 134 | do not execute it; call disabled-command-hook's value instead. */ | 134 | do not execute it; call disabled-command-function's value instead. */ |
| 135 | Lisp_Object Qdisabled, Qdisabled_command_hook; | 135 | Lisp_Object Qdisabled, Qdisabled_command_function; |
| 136 | 136 | ||
| 137 | #define NUM_RECENT_KEYS (100) | 137 | #define NUM_RECENT_KEYS (100) |
| 138 | int recent_keys_index; /* Index for storing next element into recent_keys */ | 138 | int recent_keys_index; /* Index for storing next element into recent_keys */ |
| @@ -9665,9 +9665,9 @@ a special event, so ignore the prefix argument and don't clear it. */) | |||
| 9665 | tem = Fget (cmd, Qdisabled); | 9665 | tem = Fget (cmd, Qdisabled); |
| 9666 | if (!NILP (tem) && !NILP (Vrun_hooks)) | 9666 | if (!NILP (tem) && !NILP (Vrun_hooks)) |
| 9667 | { | 9667 | { |
| 9668 | tem = Fsymbol_value (Qdisabled_command_hook); | 9668 | tem = Fsymbol_value (Qdisabled_command_function); |
| 9669 | if (!NILP (tem)) | 9669 | if (!NILP (tem)) |
| 9670 | return call1 (Vrun_hooks, Qdisabled_command_hook); | 9670 | return call1 (Vrun_hooks, Qdisabled_command_function); |
| 9671 | } | 9671 | } |
| 9672 | } | 9672 | } |
| 9673 | 9673 | ||
| @@ -10782,8 +10782,8 @@ syms_of_keyboard () | |||
| 10782 | Qtimer_event_handler = intern ("timer-event-handler"); | 10782 | Qtimer_event_handler = intern ("timer-event-handler"); |
| 10783 | staticpro (&Qtimer_event_handler); | 10783 | staticpro (&Qtimer_event_handler); |
| 10784 | 10784 | ||
| 10785 | Qdisabled_command_hook = intern ("disabled-command-hook"); | 10785 | Qdisabled_command_function = intern ("disabled-command-function"); |
| 10786 | staticpro (&Qdisabled_command_hook); | 10786 | staticpro (&Qdisabled_command_function); |
| 10787 | 10787 | ||
| 10788 | Qself_insert_command = intern ("self-insert-command"); | 10788 | Qself_insert_command = intern ("self-insert-command"); |
| 10789 | staticpro (&Qself_insert_command); | 10789 | staticpro (&Qself_insert_command); |