summaryrefslogtreecommitdiff
path: root/src/macterm.c
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2006-07-18 08:12:51 +0000
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2006-07-18 08:12:51 +0000
commitd3f31bc5893977c28fcdd0e7edaa30df06328464 (patch)
treea071248a1bb3d8a237dee1f566b74c3214adf18e /src/macterm.c
parent1e53bd0e798f2e109ea38c0b05cdcc24da81568a (diff)
downloademacs-d3f31bc5893977c28fcdd0e7edaa30df06328464.tar.gz
(XTread_socket): Undo previous change.
Diffstat (limited to 'src/macterm.c')
-rw-r--r--src/macterm.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/macterm.c b/src/macterm.c
index a6274114a25..69612302774 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -10681,7 +10681,6 @@ XTread_socket (sd, expected, hold_quit)
case autoKey:
{
int keycode = (er.message & keyCodeMask) >> 8;
- int char_code = er.message & charCodeMask;
static SInt16 last_key_script = -1;
SInt16 current_key_script;
UInt32 modifiers = er.modifiers, mapped_modifiers;
@@ -10764,11 +10763,6 @@ XTread_socket (sd, expected, hold_quit)
{
inev.kind = NON_ASCII_KEYSTROKE_EVENT;
inev.code = 0xff00 | keycode_to_xkeysym_table [keycode];
- /* Some keyboards (e.g., German, French ones) use
- different layouts for keypad keys. */
- if (inev.code >= 0xffaa && inev.code <= 0xffbd
- && char_code >= 0x2a && char_code <= 0x3d)
- inev.code = 0xff80 | char_code;
#ifdef MAC_OSX
if (modifiers & kEventKeyModifierFnMask
&& keycode <= 0x7f
@@ -10852,7 +10846,7 @@ XTread_socket (sd, expected, hold_quit)
if (inev.kind == NO_EVENT)
{
inev.kind = ASCII_KEYSTROKE_EVENT;
- inev.code = char_code;
+ inev.code = er.message & charCodeMask;
}
inev.modifiers = mac_to_emacs_modifiers (modifiers);