diff options
| author | Karoly Lorentey | 2004-12-08 22:20:27 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-12-08 22:20:27 +0000 |
| commit | fad2f6858075f49c4c8fd16f0535c287e3f14ac3 (patch) | |
| tree | 843a2ffe6caea6201877e3d2f1b6b954f47344b5 /src/keymap.c | |
| parent | 856dd47583918edd7987c13334703d3e7492d8f4 (diff) | |
| parent | b11e88237593ff7556d8535305e8f342e6b61d66 (diff) | |
| download | emacs-fad2f6858075f49c4c8fd16f0535c287e3f14ac3.tar.gz emacs-fad2f6858075f49c4c8fd16f0535c287e3f14ac3.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-714
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-271
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.c b/src/keymap.c index a5e5fbd3f93..4375b2e3a51 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1241,7 +1241,7 @@ recognize the default bindings, just as `read-key-sequence' does. */) | |||
| 1241 | c = Fevent_convert_list (c); | 1241 | c = Fevent_convert_list (c); |
| 1242 | 1242 | ||
| 1243 | /* Turn the 8th bit of string chars into a meta modifier. */ | 1243 | /* Turn the 8th bit of string chars into a meta modifier. */ |
| 1244 | if (XINT (c) & 0x80 && STRINGP (key)) | 1244 | if (INTEGERP (c) && XINT (c) & 0x80 && STRINGP (key)) |
| 1245 | XSETINT (c, (XINT (c) | meta_modifier) & ~0x80); | 1245 | XSETINT (c, (XINT (c) | meta_modifier) & ~0x80); |
| 1246 | 1246 | ||
| 1247 | /* Allow string since binding for `menu-bar-select-buffer' | 1247 | /* Allow string since binding for `menu-bar-select-buffer' |