diff options
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index be863adcb96..2e16a872190 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -3222,8 +3222,6 @@ read_char (int commandflag, Lisp_Object map, | |||
| 3222 | RETURN_UNGCPRO (c); | 3222 | RETURN_UNGCPRO (c); |
| 3223 | } | 3223 | } |
| 3224 | 3224 | ||
| 3225 | #ifdef HAVE_MENUS | ||
| 3226 | |||
| 3227 | /* Record a key that came from a mouse menu. | 3225 | /* Record a key that came from a mouse menu. |
| 3228 | Record it for echoing, for this-command-keys, and so on. */ | 3226 | Record it for echoing, for this-command-keys, and so on. */ |
| 3229 | 3227 | ||
| @@ -3254,13 +3252,11 @@ record_menu_key (Lisp_Object c) | |||
| 3254 | /* Record this character as part of the current key. */ | 3252 | /* Record this character as part of the current key. */ |
| 3255 | add_command_key (c); | 3253 | add_command_key (c); |
| 3256 | 3254 | ||
| 3257 | /* Re-reading in the middle of a command */ | 3255 | /* Re-reading in the middle of a command. */ |
| 3258 | last_input_event = c; | 3256 | last_input_event = c; |
| 3259 | num_input_events++; | 3257 | num_input_events++; |
| 3260 | } | 3258 | } |
| 3261 | 3259 | ||
| 3262 | #endif /* HAVE_MENUS */ | ||
| 3263 | |||
| 3264 | /* Return true if should recognize C as "the help character". */ | 3260 | /* Return true if should recognize C as "the help character". */ |
| 3265 | 3261 | ||
| 3266 | static bool | 3262 | static bool |
| @@ -8359,7 +8355,6 @@ read_char_x_menu_prompt (Lisp_Object map, | |||
| 8359 | if (! menu_prompting) | 8355 | if (! menu_prompting) |
| 8360 | return Qnil; | 8356 | return Qnil; |
| 8361 | 8357 | ||
| 8362 | #ifdef HAVE_MENUS | ||
| 8363 | /* If we got to this point via a mouse click, | 8358 | /* If we got to this point via a mouse click, |
| 8364 | use a real menu for mouse selection. */ | 8359 | use a real menu for mouse selection. */ |
| 8365 | if (EVENT_HAS_PARAMETERS (prev_event) | 8360 | if (EVENT_HAS_PARAMETERS (prev_event) |
| @@ -8405,7 +8400,6 @@ read_char_x_menu_prompt (Lisp_Object map, | |||
| 8405 | *used_mouse_menu = 1; | 8400 | *used_mouse_menu = 1; |
| 8406 | return value; | 8401 | return value; |
| 8407 | } | 8402 | } |
| 8408 | #endif /* HAVE_MENUS */ | ||
| 8409 | return Qnil ; | 8403 | return Qnil ; |
| 8410 | } | 8404 | } |
| 8411 | 8405 | ||