# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1256431213 0
# Node ID b61f0f08b8e168f54e6906c1ed8cc3db32f34b7c
# Parent  56b02500dbd13f5d89155fe81ff6c2fc6d696117
* keyboard.c (read_char_x_menu_prompt): Don't demand a prompt
string in menu maps (Bug#4471).

diff -r 56b02500dbd1 -r b61f0f08b8e1 src/ChangeLog
--- a/src/ChangeLog	Sat Oct 24 22:09:08 2009 +0000
+++ b/src/ChangeLog	Sun Oct 25 00:40:13 2009 +0000
@@ -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 -r 56b02500dbd1 -r b61f0f08b8e1 src/keyboard.c
--- a/src/keyboard.c	Sat Oct 24 22:09:08 2009 +0000
+++ b/src/keyboard.c	Sun Oct 25 00:40:13 2009 +0000
@@ -8561,7 +8561,6 @@
      int *used_mouse_menu;
 {
   int mapno;
-  register Lisp_Object name = Qnil;
 
   if (used_mouse_menu)
     *used_mouse_menu = 0;
@@ -8578,18 +8577,6 @@
       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.  */