[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/ccl.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/ccl.c |
Date: |
Fri, 30 May 2003 04:13:01 -0400 |
Index: emacs/src/ccl.c
diff -c emacs/src/ccl.c:1.81 emacs/src/ccl.c:1.82
*** emacs/src/ccl.c:1.81 Tue Feb 4 09:03:11 2003
--- emacs/src/ccl.c Fri May 30 03:56:08 2003
***************
*** 730,736 ****
if (bytes == 1) \
{ \
*dst++ = (ch); \
! if ((ch) >= 0x80 && (ch) < 0xA0) \
/* We may have to convert this eight-bit char to \
multibyte form later. */ \
extra_bytes++; \
--- 730,736 ----
if (bytes == 1) \
{ \
*dst++ = (ch); \
! if (extra_bytes && (ch) >= 0x80 && (ch) < 0xA0) \
/* We may have to convert this eight-bit char to \
multibyte form later. */ \
extra_bytes++; \
***************
*** 887,893 ****
each of them will be converted to multibyte form of 2-byte
sequence. For that conversion, we remember how many more bytes
we must keep in DESTINATION in this variable. */
! int extra_bytes = 0;
if (ic >= ccl->eof_ic)
ic = CCL_HEADER_MAIN;
--- 887,893 ----
each of them will be converted to multibyte form of 2-byte
sequence. For that conversion, we remember how many more bytes
we must keep in DESTINATION in this variable. */
! int extra_bytes = ccl->eight_bit_control;
if (ic >= ccl->eof_ic)
ic = CCL_HEADER_MAIN;
***************
*** 1905,1911 ****
ccl->ic = ic;
ccl->stack_idx = stack_idx;
ccl->prog = ccl_prog;
! ccl->eight_bit_control = (extra_bytes > 0);
if (consumed)
*consumed = src - source;
return (dst ? dst - destination : 0);
--- 1905,1911 ----
ccl->ic = ic;
ccl->stack_idx = stack_idx;
ccl->prog = ccl_prog;
! ccl->eight_bit_control = (extra_bytes > 1);
if (consumed)
*consumed = src - source;
return (dst ? dst - destination : 0);
***************
*** 2060,2065 ****
--- 2060,2066 ----
ccl->stack_idx = 0;
ccl->eol_type = CODING_EOL_LF;
ccl->suppress_error = 0;
+ ccl->eight_bit_control = 0;
return 0;
}