From f9d71dcd0666e61a2277fb4de449528938429fbe Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 23 May 2002 10:56:58 +0000 Subject: [PATCH] (Fdefine_coding_system_internal): Fix previous change. (decode_coding_charset): Workaround for the bug of GCC 2.96. --- src/ChangeLog | 7 +++++++ src/coding.c | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a4ad4d58e0d..a032e99475d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2002-05-23 Yong Lu + + * charset.c (Fdefine_charset_internal): Fix argument to bzero. + + * coding.c (Fdefine_coding_system_internal): Fix previous change. + (decode_coding_charset): Workaround for the bug of GCC 2.96. + 2002-05-23 Kenichi Handa * Makefile.in (lisp): Change cyrillic.elc to cyrillic.el, diff --git a/src/coding.c b/src/coding.c index a36f877d80c..c98e467369d 100644 --- a/src/coding.c +++ b/src/coding.c @@ -4346,10 +4346,11 @@ decode_coding_charset (coding) { charset = CHARSET_FROM_ID (XFASTINT (val)); dim = CHARSET_DIMENSION (charset); - while (len++ < dim) + while (len < dim) { ONE_MORE_BYTE (c); code = (code << 8) | c; + len++; } CODING_DECODE_CHAR (coding, src, src_base, src_end, charset, code, c); @@ -4363,10 +4364,11 @@ decode_coding_charset (coding) { charset = CHARSET_FROM_ID (XFASTINT (XCAR (val))); dim = CHARSET_DIMENSION (charset); - while (len++ < dim) + while (len < dim) { ONE_MORE_BYTE (c); code = (code << 8) | c; + len++; } CODING_DECODE_CHAR (coding, src, src_base, src_end, charset, code, c); @@ -7420,9 +7422,9 @@ usage: (define-coding-system-internal ...) */) { dim2 = CHARSET_DIMENSION (CHARSET_FROM_ID (XFASTINT (tmp))); if (dim < dim2) - tmp = Fcons (tmp, Fcons (XCAR (tail), Qnil)); - else tmp = Fcons (XCAR (tail), Fcons (tmp, Qnil)); + else + tmp = Fcons (tmp, Fcons (XCAR (tail), Qnil)); } else { -- 2.39.5