Mercurial > emacs

comparison src/coding.c @ 47698:77511decc5ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Kenichi Handa <handa@m17n.org>
date Mon, 30 Sep 2002 06:28:31 +0000
parents 551472d77d2a
children 1a71f916ad2f
comparison
equal deleted inserted replaced
47697:34ce7f0515d0 47698:77511decc5ff
966 } 966 }
967 *dst++ = *src++; 967 *dst++ = *src++;
968 coding->produced_char++; 968 coding->produced_char++;
969 continue; 969 continue;
970 } 970 }
971 else if (*src == 0x80) 971 else if (*src == 0x80 && coding->cmp_data)
972 { 972 {
973 /* Start of composition data. */ 973 /* Start of composition data. */
974 int consumed = decode_composition_emacs_mule (coding, src, src_end, 974 int consumed = decode_composition_emacs_mule (coding, src, src_end,
975 &dst, dst_end, 975 &dst, dst_end,
976 dst_bytes); 976 dst_bytes);
3504 { 3504 {
3505 case 0: 3505 case 0:
3506 coding->type = coding_type_emacs_mule; 3506 coding->type = coding_type_emacs_mule;
3507 coding->common_flags 3507 coding->common_flags
3508 |= CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK; 3508 |= CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK;
3509 coding->composing = COMPOSITION_NO;
3510 if (!NILP (coding->post_read_conversion)) 3509 if (!NILP (coding->post_read_conversion))
3511 coding->common_flags |= CODING_REQUIRE_DECODING_MASK; 3510 coding->common_flags |= CODING_REQUIRE_DECODING_MASK;
3512 if (!NILP (coding->pre_write_conversion)) 3511 if (!NILP (coding->pre_write_conversion))
3513 coding->common_flags |= CODING_REQUIRE_ENCODING_MASK; 3512 coding->common_flags |= CODING_REQUIRE_ENCODING_MASK;
3514 break; 3513 break;