diff options
| author | Brian Fox | 1993-10-05 01:34:06 +0000 |
|---|---|---|
| committer | Brian Fox | 1993-10-05 01:34:06 +0000 |
| commit | 5176382080f4bb8d7203f9daa7469fdea91b3dbd (patch) | |
| tree | 4b0395415f2c1478cff8b2430042f9df0a4f0a78 /src | |
| parent | 9825c716add4ee43684e9eb0b1462d8e5b9bc653 (diff) | |
| download | emacs-5176382080f4bb8d7203f9daa7469fdea91b3dbd.tar.gz emacs-5176382080f4bb8d7203f9daa7469fdea91b3dbd.zip | |
(read_key_sequence): Don't declare first_event; it is no longer used.
Change "#if 0" for first_event reading to "#if defined (GOBBLE_FIRST_EVENT)".
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 2d712cda8d3..388555b52fb 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -3779,7 +3779,10 @@ read_key_sequence (keybuf, bufsize, prompt) | |||
| 3779 | we put it off for later. While we're reading, we keep the event here. */ | 3779 | we put it off for later. While we're reading, we keep the event here. */ |
| 3780 | Lisp_Object delayed_switch_frame; | 3780 | Lisp_Object delayed_switch_frame; |
| 3781 | 3781 | ||
| 3782 | /* See the comment below... */ | ||
| 3783 | #if defined (GOBBLE_FIRST_EVENT) | ||
| 3782 | Lisp_Object first_event; | 3784 | Lisp_Object first_event; |
| 3785 | #endif | ||
| 3783 | 3786 | ||
| 3784 | int junk; | 3787 | int junk; |
| 3785 | 3788 | ||
| @@ -3813,14 +3816,16 @@ read_key_sequence (keybuf, bufsize, prompt) | |||
| 3813 | echo_start = echo_length (); | 3816 | echo_start = echo_length (); |
| 3814 | keys_start = this_command_key_count; | 3817 | keys_start = this_command_key_count; |
| 3815 | 3818 | ||
| 3816 | #if 0 /* This doesn't quite work, because some of the things | 3819 | #if defined (GOBBLE_FIRST_EVENT) |
| 3817 | that read_char does cannot safely be bypassed. | 3820 | /* This doesn't quite work, because some of the things that read_char |
| 3818 | It seems too risky to try to make this work right. */ | 3821 | does cannot safely be bypassed. It seems too risky to try to make |
| 3822 | this work right. */ | ||
| 3823 | |||
| 3819 | /* Read the first char of the sequence specially, before setting | 3824 | /* Read the first char of the sequence specially, before setting |
| 3820 | up any keymaps, in case a filter runs and switches buffers on us. */ | 3825 | up any keymaps, in case a filter runs and switches buffers on us. */ |
| 3821 | first_event = read_char (!prompt, 0, submaps, last_nonmenu_event, | 3826 | first_event = read_char (!prompt, 0, submaps, last_nonmenu_event, |
| 3822 | &junk); | 3827 | &junk); |
| 3823 | #endif | 3828 | #endif /* GOBBLE_FIRST_EVENT */ |
| 3824 | 3829 | ||
| 3825 | /* We jump here when the key sequence has been thoroughly changed, and | 3830 | /* We jump here when the key sequence has been thoroughly changed, and |
| 3826 | we need to rescan it starting from the beginning. When we jump here, | 3831 | we need to rescan it starting from the beginning. When we jump here, |
| @@ -4549,7 +4554,7 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_ | |||
| 4549 | 4554 | ||
| 4550 | /* Prompt with buf, and then read a string, completing from and | 4555 | /* Prompt with buf, and then read a string, completing from and |
| 4551 | restricting to the set of all defined commands. Don't provide | 4556 | restricting to the set of all defined commands. Don't provide |
| 4552 | any initial input. Save the command read on the extended-comman | 4557 | any initial input. Save the command read on the extended-command |
| 4553 | history list. */ | 4558 | history list. */ |
| 4554 | function = Fcompleting_read (build_string (buf), | 4559 | function = Fcompleting_read (build_string (buf), |
| 4555 | Vobarray, Qcommandp, | 4560 | Vobarray, Qcommandp, |