mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-09 13:40:50 +00:00
(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.
This commit is contained in:
parent
20e97ae684
commit
3089d25c87
1 changed files with 1 additions and 2 deletions
|
@ -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))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue