* keyboard.c (read_char_x_menu_prompt): Don't demand a prompt

string in menu maps (Bug#4471).

diff --git a/src/ChangeLog b/src/ChangeLog
index 9995421f5a57e147ccf639ca0384348e0d7a3328..cbfee8f3f07ebbef06352c78d3b1f53514fe668c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-25  Chong Yidong  <cyd@stupidchicken.com>
+
+       * keyboard.c (read_char_x_menu_prompt): Don't demand a prompt
+       string in menu maps (Bug#4471).
+
 2009-10-24  Chong Yidong  <cyd@stupidchicken.com>
 
        * nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call

diff --git a/src/keyboard.c b/src/keyboard.c
index de4e1c5647e67a586b9332b6c5e1f0caac8c39d7..b7399a651b785565690dc63d5c1aa019a9239be2 100644 (file)
--- 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.  */