Commit 7a837c89 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(CCL_READ_CHAR): If source is multibyte, pay attention to

the multibyte form of eight-bit-control characters.
(Fccl_execute_on_string): Initialize ccl->multibyte.
parent 6e264fad
......@@ -713,7 +713,12 @@ static tr_stack *mapping_stack_pointer;
if (!src) \
CCL_INVALID_CMD; \
else if (src < src_end) \
r = *src++; \
{ \
r = *src++; \
if (r == LEADING_CODE_8_BIT_CONTROL \
&& ccl->multibyte) \
r = *src++ - 0x20; \
} \
else if (ccl->last_block) \
{ \
ic = ccl->eof_ic; \
......@@ -1895,6 +1900,7 @@ is a unibyte string. By default it is a multibyte string.")
outbufsize = STRING_BYTES (XSTRING (str)) * ccl.buf_magnification + 256;
outbuf = (char *) xmalloc (outbufsize);
ccl.last_block = NILP (contin);
ccl.multibyte = STRING_MULTIBYTE (str);
produced = ccl_driver (&ccl, XSTRING (str)->data, outbuf,
STRING_BYTES (XSTRING (str)), outbufsize, (int *)0);
for (i = 0; i < 8; i++)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment