Commit 18060980 authored by Chong Yidong's avatar Chong Yidong
Browse files

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

string in menu maps (Bug#4471).
parent 3e425845
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> 2009-10-24 Chong Yidong <cyd@stupidchicken.com>
   
* nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call * nsfns.m (ns_set_name, ns_set_name_as_filename): Don't call
......
...@@ -8561,7 +8561,6 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu) ...@@ -8561,7 +8561,6 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu)
int *used_mouse_menu; int *used_mouse_menu;
{ {
int mapno; int mapno;
register Lisp_Object name = Qnil;
if (used_mouse_menu) if (used_mouse_menu)
*used_mouse_menu = 0; *used_mouse_menu = 0;
...@@ -8578,18 +8577,6 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu) ...@@ -8578,18 +8577,6 @@ read_char_x_menu_prompt (nmaps, maps, prev_event, used_mouse_menu)
nmaps = 1; 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 #ifdef HAVE_MENUS
/* If we got to this point via a mouse click, /* If we got to this point via a mouse click,
use a real menu for mouse selection. */ use a real menu for mouse selection. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment