From 18060980dd40351e12ecb29186c11ab749a9d77f Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 25 Oct 2009 00:40:13 +0000 Subject: [PATCH] * keyboard.c (read_char_x_menu_prompt): Don't demand a prompt string in menu maps (Bug#4471). --- src/ChangeLog | 5 +++++ src/keyboard.c | 13 ------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9995421f5a5..cbfee8f3f07 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-10-25 Chong Yidong + + * keyboard.c (read_char_x_menu_prompt): Don't demand a prompt + string in menu maps (Bug#4471). + 2009-10-24 Chong Yidong * nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call diff --git a/src/keyboard.c b/src/keyboard.c index de4e1c5647e..b7399a651b7 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8561,7 +8561,6 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu) int *used_mouse_menu; { int mapno; - register Lisp_Object name = Qnil; if (used_mouse_menu) *used_mouse_menu = 0; @@ -8578,18 +8577,6 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu) nmaps = 1; } - /* Get the menu name from the first map that has one (a prompt string). */ - for (mapno = 0; mapno < nmaps; mapno++) - { - name = Fkeymap_prompt (maps[mapno]); - if (!NILP (name)) - break; - } - - /* If we don't have any menus, just read a character normally. */ - if (!STRINGP (name)) - return Qnil; - #ifdef HAVE_MENUS /* If we got to this point via a mouse click, use a real menu for mouse selection. */ -- 2.39.5