Mercurial > emacs
diff src/keyboard.c @ 105758:b61f0f08b8e1
* keyboard.c (read_char_x_menu_prompt): Don't demand a prompt
string in menu maps (Bug#4471).
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 25 Oct 2009 00:40:13 +0000 |
parents | 68dd71358159 |
children | 21bdda3ded62 |
line wrap: on
line diff
--- 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. */