mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

(CCL_WRITE_CHAR): Be sure to write single byte characters

Browse Source 
as is.
(CCL_MAKE_CHAR): Use MAKE_CHAR, not MAKE_NON_ASCII_CHAR.
This commit is contained in:
Kenichi Handa 2000-05-19 23:51:55 +00:00
parent 75ec644a43
commit bd045987c2
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ccl.c
View File

@ -668,19 +668,18 @@ static tr_stack *mapping_stack_pointer;
output buffer. If CH is less than 256, CH is written as is. */
#define CCL_WRITE_CHAR(ch) \
do { \
int bytes = SINGLE_BYTE_CHAR_P (ch) ? 1: CHAR_BYTES (ch); \
if (!dst) \
CCL_INVALID_CMD; \
else \
else if (dst + bytes <= (dst_bytes ? dst_end : src)) \
{ \
unsigned char str[MAX_MULTIBYTE_LENGTH], *p = str; \
int len = CHAR_STRING (ch, str); \
if (dst + len <= (dst_bytes ? dst_end : src)) \
{ \
while (len--) *dst++ = *p++; \
} \
if (bytes == 1) \
*dst++ = (ch); \
else \
CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \
dst += CHAR_STRING (ch, dst); \
} \
else \
CCL_SUSPEND (CCL_STAT_SUSPEND_BY_DST); \
} while (0)
/* Write a string at ccl_prog[IC] of length LEN to the current output
@ -732,10 +731,10 @@ static tr_stack *mapping_stack_pointer;
\
if (code >= 256) \
c2 = c1, c1 = (code >> 7) & 0x7F; \
c = MAKE_NON_ASCII_CHAR (charset, c1, c2); \
c = MAKE_CHAR (charset, c1, c2); \
} \
else \
c = code & 0xFF; \
c = code & 0xFF; \
} while (0)