Mercurial > emacs
comparison src/keyboard.c @ 56624:05bc08d74392
Declare Qdisabled_command_function instead of Qdisabled_command_hook.
(Fcommand_execute): Use Qdisabled_command_function instead of
Qdisabled_command_hook.
(syms_of_keyboard): Ditto.
author | Luc Teirlinck <teirllm@auburn.edu> |
---|---|
date | Sun, 08 Aug 2004 16:17:23 +0000 |
parents | c78ddc1fda85 |
children | f95a8f5985be 1425b1df1da8 3fd4a5c21153 |
comparison
equal
deleted
inserted
replaced
56623:c8c558c4f4a7 | 56624:05bc08d74392 |
---|---|
129 #else | 129 #else |
130 KBOARD the_only_kboard; | 130 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 */ |
139 int total_keys; /* Total number of elements stored into recent_keys */ | 139 int total_keys; /* Total number of elements stored into recent_keys */ |
140 Lisp_Object recent_keys; /* A vector, holding the last 100 keystrokes */ | 140 Lisp_Object recent_keys; /* A vector, holding the last 100 keystrokes */ |
9663 if (SYMBOLP (cmd)) | 9663 if (SYMBOLP (cmd)) |
9664 { | 9664 { |
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 |
9674 while (1) | 9674 while (1) |
9675 { | 9675 { |
10780 real_this_command = Qnil; | 10780 real_this_command = Qnil; |
10781 | 10781 |
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); |
10790 | 10790 |
10791 Qforward_char = intern ("forward-char"); | 10791 Qforward_char = intern ("forward-char"); |