aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2010-12-25 19:19:57 +0200
committerEli Zaretskii2010-12-25 19:19:57 +0200
commit71fe378d8429cff3bd7c75b53546822ad5ceffcd (patch)
tree8bc9ffb5b1d1d0410fe1113c5ee9733f2cfe1313 /src
parent6491af11aff6364d4b2cb262a3a5e8a03c7afae5 (diff)
downloademacs-71fe378d8429cff3bd7c75b53546822ad5ceffcd.tar.gz
emacs-71fe378d8429cff3bd7c75b53546822ad5ceffcd.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 673f5f5bb99..f61b2786461 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12010-12-25 Eli Zaretskii <eliz@gnu.org> 12010-12-25 Eli Zaretskii <eliz@gnu.org>
2 2
3 * keyboard.c (parse_menu_item): Prepend " " to the key sequence
4 equivalent of a menu item when the key sequence is given by the
5 `:keys' attribute. (Bug#7662)
6
3 * xdisp.c (Fformat_mode_line): Doc fix: no need to state that only 7 * xdisp.c (Fformat_mode_line): Doc fix: no need to state that only
4 the basic faces are supported. 8 the basic faces are supported.
5 9
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)
8193 /* The previous code preferred :key-sequence to :keys, so we 8193 /* The previous code preferred :key-sequence to :keys, so we
8194 preserve this behavior. */ 8194 preserve this behavior. */
8195 if (STRINGP (keyeq) && !CONSP (keyhint)) 8195 if (STRINGP (keyeq) && !CONSP (keyhint))
8196 keyeq = Fsubstitute_command_keys (keyeq); 8196 keyeq = concat2 (build_string (" "), Fsubstitute_command_keys (keyeq));
8197 else 8197 else
8198 { 8198 {
8199 Lisp_Object prefix = keyeq; 8199 Lisp_Object prefix = keyeq;