[Emacs-diffs] emacs/src keyboard.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/03/15 17:56:31

Modified files:
        src            : keyboard.c 

Log message:
        (parse_menu_item): Don't display remappings as menu equivalent bindings 
(Bug#788).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.997&r2=1.998

Patches:
Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.997
retrieving revision 1.998
diff -u -b -r1.997 -r1.998
--- keyboard.c  12 Mar 2009 01:56:58 -0000      1.997
+++ keyboard.c  15 Mar 2009 17:56:30 -0000      1.998
@@ -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))
            {