Fix bug #7662 with aligning key bindings equivalent to menu items.

 keyboard.c (parse_menu_item): Prepend "  " to the key sequence
 equivalent of a menu item when the key sequence is given by the
 `:keys' attribute.

diff --git a/src/ChangeLog b/src/ChangeLog
index 673f5f5bb99f848b53b1c871bad44b918b3e4016..f61b2786461a8ba56997b19202792ceaead78bb2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2010-12-25  Eli Zaretskii  <eliz@gnu.org>
 
+       * keyboard.c (parse_menu_item): Prepend "  " to the key sequence
+       equivalent of a menu item when the key sequence is given by the
+       `:keys' attribute.  (Bug#7662)
+
        * xdisp.c (Fformat_mode_line): Doc fix: no need to state that only
        the basic faces are supported.
 

diff --git a/src/keyboard.c b/src/keyboard.c
index b027b3b09e6e7596718f27f538d14ab918ec2cb4..503859372816b1e0e731a943cbcde6781210fa42 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8193,7 +8193,7 @@ parse_menu_item (item, inmenubar)
     /* The previous code preferred :key-sequence to :keys, so we
        preserve this behavior.  */
     if (STRINGP (keyeq) && !CONSP (keyhint))
-      keyeq = Fsubstitute_command_keys (keyeq);
+      keyeq = concat2 (build_string ("  "), Fsubstitute_command_keys (keyeq));
     else
       {
        Lisp_Object prefix = keyeq;