mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-19 12:20:17 -08:00
Code Issues Projects Releases Wiki Activity

Merge from mainline.

Browse source
This commit is contained in:
Paul Eggert 2011-04-25 23:17:52 -07:00
commit 671875dac1
160 changed files with 3111 additions and 1389 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/coding.c
View file

@ -9071,7 +9071,7 @@ Return the corresponding code in SJIS. */)
charset_list = CODING_ATTR_CHARSET_LIST (attrs);
charset = char_charset (c, charset_list, &code);
if (code == CHARSET_INVALID_CODE (charset))
error ("Can't encode by shift_jis encoding: %d", c);
error ("Can't encode by shift_jis encoding: %c", c);
JIS_TO_SJIS (code);
return make_number (code);
@ -9142,7 +9142,7 @@ Return the corresponding character code in Big5. */)
charset_list = CODING_ATTR_CHARSET_LIST (attrs);
charset = char_charset (c, charset_list, &code);
if (code == CHARSET_INVALID_CODE (charset))
error ("Can't encode by Big5 encoding: %d", c);
error ("Can't encode by Big5 encoding: %c", c);
return make_number (code);
}