diff options
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 18d4ba8360e..bfe3755cc51 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -582,7 +582,7 @@ read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object rea | |||
| 582 | 582 | ||
| 583 | if (len == 2) | 583 | if (len == 2) |
| 584 | { | 584 | { |
| 585 | charset = emacs_mule_charset[buf[0]]; | 585 | charset = CHARSET_FROM_ID (emacs_mule_charset[buf[0]]); |
| 586 | code = buf[1] & 0x7F; | 586 | code = buf[1] & 0x7F; |
| 587 | } | 587 | } |
| 588 | else if (len == 3) | 588 | else if (len == 3) |
| @@ -590,18 +590,18 @@ read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object rea | |||
| 590 | if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11 | 590 | if (buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_11 |
| 591 | || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12) | 591 | || buf[0] == EMACS_MULE_LEADING_CODE_PRIVATE_12) |
| 592 | { | 592 | { |
| 593 | charset = emacs_mule_charset[buf[1]]; | 593 | charset = CHARSET_FROM_ID (emacs_mule_charset[buf[1]]); |
| 594 | code = buf[2] & 0x7F; | 594 | code = buf[2] & 0x7F; |
| 595 | } | 595 | } |
| 596 | else | 596 | else |
| 597 | { | 597 | { |
| 598 | charset = emacs_mule_charset[buf[0]]; | 598 | charset = CHARSET_FROM_ID (emacs_mule_charset[buf[0]]); |
| 599 | code = ((buf[1] << 8) | buf[2]) & 0x7F7F; | 599 | code = ((buf[1] << 8) | buf[2]) & 0x7F7F; |
| 600 | } | 600 | } |
| 601 | } | 601 | } |
| 602 | else | 602 | else |
| 603 | { | 603 | { |
| 604 | charset = emacs_mule_charset[buf[1]]; | 604 | charset = CHARSET_FROM_ID (emacs_mule_charset[buf[1]]); |
| 605 | code = ((buf[2] << 8) | buf[3]) & 0x7F7F; | 605 | code = ((buf[2] << 8) | buf[3]) & 0x7F7F; |
| 606 | } | 606 | } |
| 607 | c = DECODE_CHAR (charset, code); | 607 | c = DECODE_CHAR (charset, code); |