aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1995-02-23 09:05:08 +0000
committerRichard M. Stallman1995-02-23 09:05:08 +0000
commit9257760577a6fc58af6267dc24234f5a6e6e1645 (patch)
treefaabb0dad968ebe3e95aeb28e73d739c4c59ee8f /src
parent3548e138463cfdda1105b8b6f5981f9b3c86035a (diff)
downloademacs-9257760577a6fc58af6267dc24234f5a6e6e1645.tar.gz
emacs-9257760577a6fc58af6267dc24234f5a6e6e1645.zip
(menu_item_equiv_key): Delete the code that rejected
menu bindings returned by Fwhere_is_internal.
Diffstat (limited to 'src')
-rw-r--r--src/xmenu.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 5fc000c7bde..05edbb55ad0 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -355,22 +355,6 @@ menu_item_equiv_key (item_string, item1, descrip_ptr)
355 We don't try both, because that makes easymenu menus slow. */ 355 We don't try both, because that makes easymenu menus slow. */
356 savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil); 356 savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
357 357
358
359 if (VECTORP (savedkey)
360 && EQ (XVECTOR (savedkey)->contents[0], Qmenu_bar))
361 savedkey = Qnil;
362 /* Reject two-key sequences that start with a mouse click.
363 These are probably menu items. */
364 if (VECTORP (savedkey)
365 && XVECTOR (savedkey)->size > 1
366 && SYMBOLP (XVECTOR (savedkey)->contents[0]))
367 {
368 Lisp_Object tem;
369
370 tem = Fget (XVECTOR (savedkey)->contents[0], Qevent_kind);
371 if (EQ (tem, Qmouse_click))
372 savedkey = Qnil;
373 }
374 if (!NILP (savedkey)) 358 if (!NILP (savedkey))
375 { 359 {
376 descrip = Fkey_description (savedkey); 360 descrip = Fkey_description (savedkey);