changeset 102586:d31c1cf523b2

(parse_menu_item): Don't display remappings as menu equivalent bindings (Bug#788).
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 15 Mar 2009 17:56:30 +0000
parents a61eb3b1d42c
children b842dd348c1d
files src/keyboard.c
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Sun Mar 15 17:56:14 2009 +0000
+++ b/src/keyboard.c	Sun Mar 15 17:56:30 2009 +0000
@@ -471,6 +471,8 @@
 Lisp_Object Qselect_window;
 Lisp_Object Qhelp_echo;
 
+extern Lisp_Object Qremap;
+
 #if defined (HAVE_MOUSE) || defined (HAVE_GPM)
 Lisp_Object Qmouse_fixup_help_message;
 #endif
@@ -8067,6 +8069,11 @@
 	      && ! NILP (Fget (def, Qmenu_alias)))
 	    def = XSYMBOL (def)->function;
 	  tem = Fwhere_is_internal (def, Qnil, Qt, Qnil, Qt);
+
+	  /* Don't display remap bindings.*/
+	  if (VECTORP (tem) && ASIZE (tem) > 0 && EQ (AREF (tem, 0), Qremap))
+	    tem = Qnil;
+
 	  XSETCAR (cachelist, tem);
 	  if (NILP (tem))
 	    {