masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-19 02:10:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

(decode_coding_emacs_mule): Check coding->cmp_data.

Browse source 
Only when it is non-nil, handle composition sequence.
(setup_coding_system) <0>: Don't force composition handling.
This commit is contained in:
Kenichi Handa 2002-09-30 06:28:31 +00:00
parent 20e97ae684
commit 3089d25c87
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/coding.c
View file

@ -968,7 +968,7 @@ decode_coding_emacs_mule (coding, source, destination, src_bytes, dst_bytes)
coding->produced_char++; coding->produced_char++;
continue; continue;
} }
else if (*src == 0x80) else if (*src == 0x80 && coding->cmp_data)
{ {
/* Start of composition data. */ /* Start of composition data. */
int consumed = decode_composition_emacs_mule (coding, src, src_end, 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->type = coding_type_emacs_mule;
coding->common_flags coding->common_flags
|= CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK; |= CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK;
coding->composing = COMPOSITION_NO;
if (!NILP (coding->post_read_conversion)) if (!NILP (coding->post_read_conversion))
coding->common_flags |= CODING_REQUIRE_DECODING_MASK; coding->common_flags |= CODING_REQUIRE_DECODING_MASK;
if (!NILP (coding->pre_write_conversion)) if (!NILP (coding->pre_write_conversion))