diff options
| author | YAMAMOTO Mitsuharu | 2006-06-16 08:00:54 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2006-06-16 08:00:54 +0000 |
| commit | fa7f56512042d1848cd722a4fb12b58fd7345c01 (patch) | |
| tree | 06a35f5cd8626e7ad1990be5374fc3222e3ec8b6 /src | |
| parent | 0e152500ab863b88e9f7ea1b1331172a3c8cd84b (diff) | |
| download | emacs-fa7f56512042d1848cd722a4fb12b58fd7345c01.tar.gz emacs-fa7f56512042d1848cd722a4fb12b58fd7345c01.zip | |
(mac_set_unicode_keystroke_event): Don't use MAKE_CHAR.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macterm.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/macterm.c b/src/macterm.c index 549e1e7977b..dc449498a4a 100644 --- a/src/macterm.c +++ b/src/macterm.c | |||
| @@ -10037,34 +10037,10 @@ mac_set_unicode_keystroke_event (code, buf) | |||
| 10037 | int charset_id, c1, c2; | 10037 | int charset_id, c1, c2; |
| 10038 | 10038 | ||
| 10039 | if (code < 0x80) | 10039 | if (code < 0x80) |
| 10040 | { | 10040 | buf->kind = ASCII_KEYSTROKE_EVENT; |
| 10041 | buf->kind = ASCII_KEYSTROKE_EVENT; | ||
| 10042 | buf->code = code; | ||
| 10043 | } | ||
| 10044 | else if (code < 0x100) | ||
| 10045 | { | ||
| 10046 | if (code < 0xA0) | ||
| 10047 | charset_id = CHARSET_8_BIT_CONTROL; | ||
| 10048 | else | ||
| 10049 | charset_id = charset_latin_iso8859_1; | ||
| 10050 | buf->kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT; | ||
| 10051 | buf->code = MAKE_CHAR (charset_id, code, 0); | ||
| 10052 | } | ||
| 10053 | else | 10041 | else |
| 10054 | { | 10042 | buf->kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT; |
| 10055 | if (code < 0x2500) | 10043 | buf->code = code; |
| 10056 | charset_id = charset_mule_unicode_0100_24ff, | ||
| 10057 | code -= 0x100; | ||
| 10058 | else if (code < 0x33FF) | ||
| 10059 | charset_id = charset_mule_unicode_2500_33ff, | ||
| 10060 | code -= 0x2500; | ||
| 10061 | else if (code >= 0xE000) | ||
| 10062 | charset_id = charset_mule_unicode_e000_ffff, | ||
| 10063 | code -= 0xE000; | ||
| 10064 | c1 = (code / 96) + 32, c2 = (code % 96) + 32; | ||
| 10065 | buf->kind = MULTIBYTE_CHAR_KEYSTROKE_EVENT; | ||
| 10066 | buf->code = MAKE_CHAR (charset_id, c1, c2); | ||
| 10067 | } | ||
| 10068 | } | 10044 | } |
| 10069 | #endif | 10045 | #endif |
| 10070 | 10046 | ||