diff options
| author | YAMAMOTO Mitsuharu | 2006-07-18 08:12:51 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2006-07-18 08:12:51 +0000 |
| commit | d3f31bc5893977c28fcdd0e7edaa30df06328464 (patch) | |
| tree | a071248a1bb3d8a237dee1f566b74c3214adf18e /src/macterm.c | |
| parent | 1e53bd0e798f2e109ea38c0b05cdcc24da81568a (diff) | |
| download | emacs-d3f31bc5893977c28fcdd0e7edaa30df06328464.tar.gz emacs-d3f31bc5893977c28fcdd0e7edaa30df06328464.zip | |
(XTread_socket): Undo previous change.
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 8 |
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) | |||
| 10681 | case autoKey: | 10681 | case autoKey: |
| 10682 | { | 10682 | { |
| 10683 | int keycode = (er.message & keyCodeMask) >> 8; | 10683 | int keycode = (er.message & keyCodeMask) >> 8; |
| 10684 | int char_code = er.message & charCodeMask; | ||
| 10685 | static SInt16 last_key_script = -1; | 10684 | static SInt16 last_key_script = -1; |
| 10686 | SInt16 current_key_script; | 10685 | SInt16 current_key_script; |
| 10687 | UInt32 modifiers = er.modifiers, mapped_modifiers; | 10686 | UInt32 modifiers = er.modifiers, mapped_modifiers; |
| @@ -10764,11 +10763,6 @@ XTread_socket (sd, expected, hold_quit) | |||
| 10764 | { | 10763 | { |
| 10765 | inev.kind = NON_ASCII_KEYSTROKE_EVENT; | 10764 | inev.kind = NON_ASCII_KEYSTROKE_EVENT; |
| 10766 | inev.code = 0xff00 | keycode_to_xkeysym_table [keycode]; | 10765 | inev.code = 0xff00 | keycode_to_xkeysym_table [keycode]; |
| 10767 | /* Some keyboards (e.g., German, French ones) use | ||
| 10768 | different layouts for keypad keys. */ | ||
| 10769 | if (inev.code >= 0xffaa && inev.code <= 0xffbd | ||
| 10770 | && char_code >= 0x2a && char_code <= 0x3d) | ||
| 10771 | inev.code = 0xff80 | char_code; | ||
| 10772 | #ifdef MAC_OSX | 10766 | #ifdef MAC_OSX |
| 10773 | if (modifiers & kEventKeyModifierFnMask | 10767 | if (modifiers & kEventKeyModifierFnMask |
| 10774 | && keycode <= 0x7f | 10768 | && keycode <= 0x7f |
| @@ -10852,7 +10846,7 @@ XTread_socket (sd, expected, hold_quit) | |||
| 10852 | if (inev.kind == NO_EVENT) | 10846 | if (inev.kind == NO_EVENT) |
| 10853 | { | 10847 | { |
| 10854 | inev.kind = ASCII_KEYSTROKE_EVENT; | 10848 | inev.kind = ASCII_KEYSTROKE_EVENT; |
| 10855 | inev.code = char_code; | 10849 | inev.code = er.message & charCodeMask; |
| 10856 | } | 10850 | } |
| 10857 | 10851 | ||
| 10858 | inev.modifiers = mac_to_emacs_modifiers (modifiers); | 10852 | inev.modifiers = mac_to_emacs_modifiers (modifiers); |