aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2007-05-07 20:50:08 +0000
committerAndreas Schwab2007-05-07 20:50:08 +0000
commitd6d8548d54477b3d9f4e2ba5d3bf489cf0de9d2f (patch)
tree2833b2b61cdc154559df906f3ba540d243214970
parent7489372ab1007b2ac97860071af11f5143779e15 (diff)
downloademacs-d6d8548d54477b3d9f4e2ba5d3bf489cf0de9d2f.tar.gz
emacs-d6d8548d54477b3d9f4e2ba5d3bf489cf0de9d2f.zip
(Flookup_key): Fix typo in last change.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keymap.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b6340a19cb1..4f44f7d0834 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12007-05-07 Andreas Schwab <schwab@suse.de>
2
3 * keymap.c (Flookup_key): Fix typo in last change.
4
12007-05-07 Stefan Monnier <monnier@iro.umontreal.ca> 52007-05-07 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * keymap.c (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier 7 * keymap.c (Fdefine_key, Flookup_key): Only do the 0x80->meta_modifier
diff --git a/src/keymap.c b/src/keymap.c
index 145d872863a..dbcf1d6fcfd 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1313,7 +1313,7 @@ recognize the default bindings, just as `read-key-sequence' does. */)
1313 c = Fevent_convert_list (c); 1313 c = Fevent_convert_list (c);
1314 1314
1315 /* Turn the 8th bit of string chars into a meta modifier. */ 1315 /* Turn the 8th bit of string chars into a meta modifier. */
1316 if (STRINGP (key) && XINT (c) & 0x8 && !STRING_MULTIBYTE (key)) 1316 if (STRINGP (key) && XINT (c) & 0x80 && !STRING_MULTIBYTE (key))
1317 XSETINT (c, (XINT (c) | meta_modifier) & ~0x80); 1317 XSETINT (c, (XINT (c) | meta_modifier) & ~0x80);
1318 1318
1319 /* Allow string since binding for `menu-bar-select-buffer' 1319 /* Allow string since binding for `menu-bar-select-buffer'