Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-25 14:27:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

(unibyte_char_to_multibyte): Refer to

Browse source 
charset_unibyte, not charset_primary.
(multibyte_char_to_unibyte): Likewise.
(Funibyte_char_to_multibyte): Likewise.
This commit is contained in:
Kenichi Handa 2002-08-15 02:28:08 +00:00
parent 556383ac2f
commit ac86488bf2
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/character.c
View file

@ -181,14 +181,14 @@ translate_char (table, c)
}
/* Convert the unibyte character C to the corresponding multibyte
character based on the current value of charset_primary. If C
character based on the current value of charset_unibyte. If C
can't be converted, return C. */
int
unibyte_char_to_multibyte (c)
int c;
{
struct charset *charset = CHARSET_FROM_ID (charset_primary);
struct charset *charset = CHARSET_FROM_ID (charset_unibyte);
int c1 = DECODE_CHAR (charset, c);
return ((c1 >= 0) ? c1 : c);
@ -196,8 +196,8 @@ unibyte_char_to_multibyte (c)
/* Convert the multibyte character C to unibyte 8-bit character based
on the current value of charset_primary. If dimension of
charset_primary is more than one, return (C & 0xFF).
on the current value of charset_unibyte. If dimension of
charset_unibyte is more than one, return (C & 0xFF).
The argument REV_TBL is now ignored. It will be removed in the
future. */
@ -207,7 +207,7 @@ multibyte_char_to_unibyte (c, rev_tbl)
int c;
Lisp_Object rev_tbl;
{
struct charset *charset = CHARSET_FROM_ID (charset_primary);
struct charset *charset = CHARSET_FROM_ID (charset_unibyte);
unsigned c1 = ENCODE_CHAR (charset, c);
return ((c1 != CHARSET_INVALID_CODE (charset)) ? c1 : c & 0xFF);
@ -244,7 +244,7 @@ the current primary charset (value of `charset-primary'). */)
c = XFASTINT (ch);
if (c >= 0400)
error ("Invalid unibyte character: %d", c);
charset = CHARSET_FROM_ID (charset_primary);
charset = CHARSET_FROM_ID (charset_unibyte);
c = DECODE_CHAR (charset, c);
if (c < 0)
c = BYTE8_TO_CHAR (XFASTINT (ch));
@ -260,7 +260,6 @@ the current primary charset (value of `charset-primary'). */)
Lisp_Object ch;
{
int c;
struct charset *charset;
CHECK_CHARACTER (ch);
c = XFASTINT (ch);