diff options
| author | Kenichi Handa <handa@m17n.org> | 2002-09-30 06:28:31 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2002-09-30 06:28:31 +0000 |
| commit | 3089d25c87fd26da13b93a0c5072772e5d068b3c (patch) | |
| tree | 81c2643c4f90319e468c5429d24a8b1f0c52f30e /src/coding.c | |
| parent | 20e97ae684ce387adfdfec81d2075bb4ec2bb8fd (diff) | |
| download | emacs-3089d25c87fd26da13b93a0c5072772e5d068b3c.tar.gz | |
(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.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 3 |
1 files changed, 1 insertions, 2 deletions
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)) |