[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100332: Fix bug #7662 with aligning key bindings equivalent to menu items.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100332
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-12-25 19:19:57 +0200
message:
  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.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-12-25 10:14:48 +0000
+++ b/src/ChangeLog     2010-12-25 17:19:57 +0000
@@ -1,5 +1,9 @@
 2010-12-25  Eli Zaretskii  <address@hidden>
 
+       * 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.
 

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2010-12-10 18:23:43 +0000
+++ b/src/keyboard.c    2010-12-25 17:19:57 +0000
@@ -8193,7 +8193,7 @@
     /* 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;