From: Kenichi Handa Date: Mon, 30 Sep 2002 06:28:31 +0000 (+0000) Subject: (decode_coding_emacs_mule): Check coding->cmp_data. X-Git-Tag: ttn-vms-21-2-B4~12988 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3089d25c87fd26da13b93a0c5072772e5d068b3c;p=emacs.git (decode_coding_emacs_mule): Check coding->cmp_data. Only when it is non-nil, handle composition sequence. (setup_coding_system) <0>: Don't force composition handling. --- diff --git a/src/coding.c b/src/coding.c index 0bb2bd3fcd8..4636a0712fe 100644 --- a/src/coding.c +++ b/src/coding.c @@ -968,7 +968,7 @@ decode_coding_emacs_mule (coding, source, destination, src_bytes, dst_bytes) coding->produced_char++; continue; } - else if (*src == 0x80) + else if (*src == 0x80 && coding->cmp_data) { /* Start of composition data. */ int consumed = decode_composition_emacs_mule (coding, src, src_end, @@ -3506,7 +3506,6 @@ setup_coding_system (coding_system, coding) coding->type = coding_type_emacs_mule; coding->common_flags |= CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK; - coding->composing = COMPOSITION_NO; if (!NILP (coding->post_read_conversion)) coding->common_flags |= CODING_REQUIRE_DECODING_MASK; if (!NILP (coding->pre_write_conversion))