From 0b5670c99611768ebce5151356e89d8c01bda8bb Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 1 Oct 2003 04:40:19 +0000 Subject: [PATCH] (consume_chars): If coding->src_object is nil, don't check annotation. --- src/coding.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/coding.c b/src/coding.c index 5fc381e80b2..86be1b4020d 100644 --- a/src/coding.c +++ b/src/coding.c @@ -6019,14 +6019,19 @@ consume_chars (coding) /* Note: composition handling is not yet implemented. */ coding->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK; - if (coding->common_flags & CODING_ANNOTATE_COMPOSITION_MASK) - stop = stop_composition = pos; + if (NILP (coding->src_object)) + stop = stop_composition = stop_charset = end_pos; else - stop = stop_composition = end_pos; - if (coding->common_flags & CODING_ANNOTATE_CHARSET_MASK) - stop = stop_charset = pos; - else - stop_charset = end_pos; + { + if (coding->common_flags & CODING_ANNOTATE_COMPOSITION_MASK) + stop = stop_composition = pos; + else + stop = stop_composition = end_pos; + if (coding->common_flags & CODING_ANNOTATE_CHARSET_MASK) + stop = stop_charset = pos; + else + stop_charset = end_pos; + } /* Compensate for CRLF and annotation. */ buf_end -= 1 + MAX_ANNOTATION_LENGTH; -- 2.39.2