Mercurial > emacs
comparison src/keyboard.c @ 83188:1425b1df1da8
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-482
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-483
Build-in-place tweak
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-484
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-228
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 09 Aug 2004 11:05:10 +0000 |
parents | 09f3fd9f680d 05bc08d74392 |
children | 22658e29bd48 |
comparison
equal
deleted
inserted
replaced
83187:4a196c3bd2d8 | 83188:1425b1df1da8 |
---|---|
125 #else | 125 #else |
126 KBOARD the_only_kboard; | 126 KBOARD the_only_kboard; |
127 #endif | 127 #endif |
128 | 128 |
129 /* Non-nil disable property on a command means | 129 /* Non-nil disable property on a command means |
130 do not execute it; call disabled-command-hook's value instead. */ | 130 do not execute it; call disabled-command-function's value instead. */ |
131 Lisp_Object Qdisabled, Qdisabled_command_hook; | 131 Lisp_Object Qdisabled, Qdisabled_command_function; |
132 | 132 |
133 #define NUM_RECENT_KEYS (100) | 133 #define NUM_RECENT_KEYS (100) |
134 int recent_keys_index; /* Index for storing next element into recent_keys */ | 134 int recent_keys_index; /* Index for storing next element into recent_keys */ |
135 int total_keys; /* Total number of elements stored into recent_keys */ | 135 int total_keys; /* Total number of elements stored into recent_keys */ |
136 Lisp_Object recent_keys; /* A vector, holding the last 100 keystrokes */ | 136 Lisp_Object recent_keys; /* A vector, holding the last 100 keystrokes */ |
9734 if (SYMBOLP (cmd)) | 9734 if (SYMBOLP (cmd)) |
9735 { | 9735 { |
9736 tem = Fget (cmd, Qdisabled); | 9736 tem = Fget (cmd, Qdisabled); |
9737 if (!NILP (tem) && !NILP (Vrun_hooks)) | 9737 if (!NILP (tem) && !NILP (Vrun_hooks)) |
9738 { | 9738 { |
9739 tem = Fsymbol_value (Qdisabled_command_hook); | 9739 tem = Fsymbol_value (Qdisabled_command_function); |
9740 if (!NILP (tem)) | 9740 if (!NILP (tem)) |
9741 return call1 (Vrun_hooks, Qdisabled_command_hook); | 9741 return call1 (Vrun_hooks, Qdisabled_command_function); |
9742 } | 9742 } |
9743 } | 9743 } |
9744 | 9744 |
9745 while (1) | 9745 while (1) |
9746 { | 9746 { |
10914 real_this_command = Qnil; | 10914 real_this_command = Qnil; |
10915 | 10915 |
10916 Qtimer_event_handler = intern ("timer-event-handler"); | 10916 Qtimer_event_handler = intern ("timer-event-handler"); |
10917 staticpro (&Qtimer_event_handler); | 10917 staticpro (&Qtimer_event_handler); |
10918 | 10918 |
10919 Qdisabled_command_hook = intern ("disabled-command-hook"); | 10919 Qdisabled_command_function = intern ("disabled-command-function"); |
10920 staticpro (&Qdisabled_command_hook); | 10920 staticpro (&Qdisabled_command_function); |
10921 | 10921 |
10922 Qself_insert_command = intern ("self-insert-command"); | 10922 Qself_insert_command = intern ("self-insert-command"); |
10923 staticpro (&Qself_insert_command); | 10923 staticpro (&Qself_insert_command); |
10924 | 10924 |
10925 Qforward_char = intern ("forward-char"); | 10925 Qforward_char = intern ("forward-char"); |
11412 DEFVAR_KBOARD ("overriding-terminal-local-map", | 11412 DEFVAR_KBOARD ("overriding-terminal-local-map", |
11413 Voverriding_terminal_local_map, | 11413 Voverriding_terminal_local_map, |
11414 doc: /* Per-terminal keymap that overrides all other local keymaps. | 11414 doc: /* Per-terminal keymap that overrides all other local keymaps. |
11415 If this variable is non-nil, it is used as a keymap instead of the | 11415 If this variable is non-nil, it is used as a keymap instead of the |
11416 buffer's local map, and the minor mode keymaps and text property keymaps. | 11416 buffer's local map, and the minor mode keymaps and text property keymaps. |
11417 It also overrides `overriding-local-map'. | |
11417 This variable is intended to let commands such as `universal-argument' | 11418 This variable is intended to let commands such as `universal-argument' |
11418 set up a different keymap for reading the next command. */); | 11419 set up a different keymap for reading the next command. */); |
11419 | 11420 |
11420 DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, | 11421 DEFVAR_LISP ("overriding-local-map", &Voverriding_local_map, |
11421 doc: /* Keymap that overrides all other local keymaps. | 11422 doc: /* Keymap that overrides all other local keymaps. |