diff options
| author | Kenichi Handa | 2010-11-25 12:55:14 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-11-25 12:55:14 +0900 |
| commit | b84ae584330c940010bc543fd925eddeb13fd9e2 (patch) | |
| tree | c0a1ef38fd720674080b3ef1fc8e5f3cad6e7145 /src/lread.c | |
| parent | cf5314c93a722b73cbf0f3607bea152d79c3df7b (diff) | |
| download | emacs-b84ae584330c940010bc543fd925eddeb13fd9e2.tar.gz emacs-b84ae584330c940010bc543fd925eddeb13fd9e2.zip | |
Fix decoding of emacs-mule coding system.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lread.c b/src/lread.c index c96e391a2d3..13de4d01317 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -616,7 +616,7 @@ read_emacs_mule_char (c, readbyte, readcharfun) | |||
| 616 | 616 | ||
| 617 | if (len == 2) | 617 | if (len == 2) |
| 618 | { | 618 | { |
| 619 | charset = emacs_mule_charset[buf[0]]; | 619 | charset = CHARSET_FROM_ID (emacs_mule_charset[buf[0]]); |
| 620 | code = buf[1] & 0x7F; | 620 | code = buf[1] & 0x7F; |
| 621 | } | 621 | } |
| 622 | else if (len == 3) | 622 | else if (len == 3) |
| @@ -624,18 +624,18 @@ read_emacs_mule_char (c, readbyte, readcharfun) | |||
| 624 | if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11 | 624 | if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11 |
| 625 | || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12) | 625 | || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12) |
| 626 | { | 626 | { |
| 627 | charset = emacs_mule_charset[buf[1]]; | 627 | charset = CHARSET_FROM_ID (emacs_mule_charset[buf[1]]); |
| 628 | code = buf[2] & 0x7F; | 628 | code = buf[2] & 0x7F; |
| 629 | } | 629 | } |
| 630 | else | 630 | else |
| 631 | { | 631 | { |
| 632 | charset = emacs_mule_charset[buf[0]]; | 632 | charset = CHARSET_FROM_ID (emacs_mule_charset[buf[0]]); |
| 633 | code = ((buf[1] << 8) | buf[2]) & 0x7F7F; | 633 | code = ((buf[1] << 8) | buf[2]) & 0x7F7F; |
| 634 | } | 634 | } |
| 635 | } | 635 | } |
| 636 | else | 636 | else |
| 637 | { | 637 | { |
| 638 | charset = emacs_mule_charset[buf[1]]; | 638 | charset = CHARSET_FROM_ID (emacs_mule_charset[buf[1]]); |
| 639 | code = ((buf[2] << 8) | buf[3]) & 0x7F7F; | 639 | code = ((buf[2] << 8) | buf[3]) & 0x7F7F; |
| 640 | } | 640 | } |
| 641 | c = DECODE_CHAR (charset, code); | 641 | c = DECODE_CHAR (charset, code); |