From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Dec 2010 17:19:57 +0000 (+0200)
Subject: Fix bug #7662 with aligning key bindings equivalent to menu items.
X-Git-Tag: emacs-pretest-23.2.92~35
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71fe378d8429cff3bd7c75b53546822ad5ceffcd;p=emacs.git

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 673f5f5bb99..f61b2786461 100644
--- 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 b027b3b09e6..50385937281 100644
--- 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;