diff options
| author | Eli Zaretskii | 1999-04-06 10:25:31 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 1999-04-06 10:25:31 +0000 |
| commit | a54b7a82c84ea1c7d4d28b53abfe4e5bfe9e1011 (patch) | |
| tree | 0b495382f6b894604e01e3bacc01666677b05cce | |
| parent | 6445414a594d14ed33cf48ed1ae95764f81bcbc7 (diff) | |
| download | emacs-a54b7a82c84ea1c7d4d28b53abfe4e5bfe9e1011.tar.gz emacs-a54b7a82c84ea1c7d4d28b53abfe4e5bfe9e1011.zip | |
(dos_rawgetc): Don't zero out c if private translation
table was used.
(jp_kbd_translate_table): Support C-\.
(it_kbd_translate_table): Map `>' correctly.
(it_keyboard): Add `>'.
| -rw-r--r-- | src/msdos.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/msdos.c b/src/msdos.c index 25f61b1b532..e919c203dbb 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -1538,14 +1538,14 @@ static struct dos_keyboard_map fr_keyboard = { | |||
| 1538 | */ | 1538 | */ |
| 1539 | 1539 | ||
| 1540 | static struct kbd_translate it_kbd_translate_table[] = { | 1540 | static struct kbd_translate it_kbd_translate_table[] = { |
| 1541 | { 0x56, 0x3c, Map | 13 }, | 1541 | { 0x56, 0x3c, Normal | 13 }, |
| 1542 | { 0x56, 0x3e, Map | 13 }, | 1542 | { 0x56, 0x3e, Normal | 27 }, |
| 1543 | { 0, 0, 0 } | 1543 | { 0, 0, 0 } |
| 1544 | }; | 1544 | }; |
| 1545 | static struct dos_keyboard_map it_keyboard = { | 1545 | static struct dos_keyboard_map it_keyboard = { |
| 1546 | /* 0 1 2 3 4 5 */ | 1546 | /* 0 1 2 3 4 5 */ |
| 1547 | /* 0 123456789012345678901234567890123456789012345678901234 */ | 1547 | /* 0 123456789012345678901234567890123456789012345678901234 */ |
| 1548 | "\\1234567890'< qwertyuiopŠ+ asdfghjkl•…— zxcvbnm,.- ", | 1548 | "\\1234567890'< qwertyuiopŠ+> asdfghjkl•…— zxcvbnm,.- ", |
| 1549 | /* 01 23456789012345678901234567890123456789012345678901234 */ | 1549 | /* 01 23456789012345678901234567890123456789012345678901234 */ |
| 1550 | "|!\"œ$%&/()=?^> QWERTYUIOP‚* ASDFGHJKL‡øõ ZXCVBNM;:_ ", | 1550 | "|!\"œ$%&/()=?^> QWERTYUIOP‚* ASDFGHJKL‡øõ ZXCVBNM;:_ ", |
| 1551 | /* 0123456789012345678901234567890123456789012345678901234 */ | 1551 | /* 0123456789012345678901234567890123456789012345678901234 */ |
| @@ -1569,6 +1569,7 @@ static struct kbd_translate jp_kbd_translate_table[] = { | |||
| 1569 | { 0x73, 0x5f, Normal | 0 }, | 1569 | { 0x73, 0x5f, Normal | 0 }, |
| 1570 | { 0x7d, 0x5c, Normal | 13 }, | 1570 | { 0x7d, 0x5c, Normal | 13 }, |
| 1571 | { 0x7d, 0x7c, Normal | 13 }, | 1571 | { 0x7d, 0x7c, Normal | 13 }, |
| 1572 | { 0x7d, 0x1c, Map | 13 }, | ||
| 1572 | { 0, 0, 0 } | 1573 | { 0, 0, 0 } |
| 1573 | }; | 1574 | }; |
| 1574 | static struct dos_keyboard_map jp_keyboard = { | 1575 | static struct dos_keyboard_map jp_keyboard = { |
| @@ -2131,8 +2132,6 @@ dos_rawgetc () | |||
| 2131 | } | 2132 | } |
| 2132 | 2133 | ||
| 2133 | case Map: | 2134 | case Map: |
| 2134 | if (keyboard->translate_table) | ||
| 2135 | c = 0; /* so key gets mapped through country-specific kbd */ | ||
| 2136 | if (c && !(mask & ALT_P) && !((mask & SHIFT_P) && (mask & CTRL_P))) | 2135 | if (c && !(mask & ALT_P) && !((mask & SHIFT_P) && (mask & CTRL_P))) |
| 2137 | if (!keyboard_map_all) | 2136 | if (!keyboard_map_all) |
| 2138 | return c; | 2137 | return c; |