diff options
| author | Paul Eggert | 2011-04-25 23:17:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-25 23:17:52 -0700 |
| commit | 671875dac181f7f1337f21d013a9c3d5f235ddf2 (patch) | |
| tree | 4091c2537439713df8efe8d3376116a6db3eb1c5 /src/coding.c | |
| parent | f904488ff40dcee3e340b63a6386dde124d1241c (diff) | |
| parent | 0c6b7b19e52ba18b5d4fd2d4b73b133a0a721603 (diff) | |
| download | emacs-671875dac181f7f1337f21d013a9c3d5f235ddf2.tar.gz emacs-671875dac181f7f1337f21d013a9c3d5f235ddf2.zip | |
Merge from mainline.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index 6cd039a0903..c14a41036ac 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -9071,7 +9071,7 @@ Return the corresponding code in SJIS. */) | |||
| 9071 | charset_list = CODING_ATTR_CHARSET_LIST (attrs); | 9071 | charset_list = CODING_ATTR_CHARSET_LIST (attrs); |
| 9072 | charset = char_charset (c, charset_list, &code); | 9072 | charset = char_charset (c, charset_list, &code); |
| 9073 | if (code == CHARSET_INVALID_CODE (charset)) | 9073 | if (code == CHARSET_INVALID_CODE (charset)) |
| 9074 | error ("Can't encode by shift_jis encoding: %d", c); | 9074 | error ("Can't encode by shift_jis encoding: %c", c); |
| 9075 | JIS_TO_SJIS (code); | 9075 | JIS_TO_SJIS (code); |
| 9076 | 9076 | ||
| 9077 | return make_number (code); | 9077 | return make_number (code); |
| @@ -9142,7 +9142,7 @@ Return the corresponding character code in Big5. */) | |||
| 9142 | charset_list = CODING_ATTR_CHARSET_LIST (attrs); | 9142 | charset_list = CODING_ATTR_CHARSET_LIST (attrs); |
| 9143 | charset = char_charset (c, charset_list, &code); | 9143 | charset = char_charset (c, charset_list, &code); |
| 9144 | if (code == CHARSET_INVALID_CODE (charset)) | 9144 | if (code == CHARSET_INVALID_CODE (charset)) |
| 9145 | error ("Can't encode by Big5 encoding: %d", c); | 9145 | error ("Can't encode by Big5 encoding: %c", c); |
| 9146 | 9146 | ||
| 9147 | return make_number (code); | 9147 | return make_number (code); |
| 9148 | } | 9148 | } |