Mercurial > emacs
changeset 89562:12fbcfebb9ad
(consume_chars): If coding->src_object is nil, don't check annotation.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 01 Oct 2003 04:40:19 +0000 |
| parents | 4047309fb78f |
| children | d193de460ec1 |
| files | src/coding.c |
| diffstat | 1 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/coding.c Tue Sep 30 23:28:01 2003 +0000 +++ b/src/coding.c Wed Oct 01 04:40:19 2003 +0000 @@ -6019,14 +6019,19 @@ /* 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;