aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-03-15 17:56:30 +0000
committerChong Yidong2009-03-15 17:56:30 +0000
commit224fc3d1088868941f5185099701d55086260267 (patch)
treebacabec4b1db6d1ca1b23e0da44ee79f123bea2d
parent9286b16a25d44de0e8b51c26e190502920cbd29d (diff)
downloademacs-224fc3d1088868941f5185099701d55086260267.tar.gz
emacs-224fc3d1088868941f5185099701d55086260267.zip
(parse_menu_item): Don't display remappings as menu equivalent bindings (Bug#788).
-rw-r--r--src/keyboard.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 5d3ae421d0f..0052a489e88 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -471,6 +471,8 @@ Lisp_Object Qmake_frame_visible;
471Lisp_Object Qselect_window; 471Lisp_Object Qselect_window;
472Lisp_Object Qhelp_echo; 472Lisp_Object Qhelp_echo;
473 473
474extern Lisp_Object Qremap;
475
474#if defined (HAVE_MOUSE) || defined (HAVE_GPM) 476#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
475Lisp_Object Qmouse_fixup_help_message; 477Lisp_Object Qmouse_fixup_help_message;
476#endif 478#endif
@@ -8067,6 +8069,11 @@ parse_menu_item (item, notreal, inmenubar)
8067 && ! NILP (Fget (def, Qmenu_alias))) 8069 && ! NILP (Fget (def, Qmenu_alias)))
8068 def = XSYMBOL (def)->function; 8070 def = XSYMBOL (def)->function;
8069 tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qt); 8071 tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qt);
8072
8073 /* Don't display remap bindings.*/
8074 if (VECTORP (tem) && ASIZE (tem) > 0 && EQ (AREF (tem, 0), Qremap))
8075 tem = Qnil;
8076
8070 XSETCAR (cachelist, tem); 8077 XSETCAR (cachelist, tem);
8071 if (NILP (tem)) 8078 if (NILP (tem))
8072 { 8079 {