Mercurial > emacs
comparison src/coding.c @ 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 | 4f394eed6ff2 |
children | 242f2cc0134b |
comparison
equal
deleted
inserted
replaced
89561:4047309fb78f | 89562:12fbcfebb9ad |
---|---|
6017 eol_type = Qunix; | 6017 eol_type = Qunix; |
6018 | 6018 |
6019 /* Note: composition handling is not yet implemented. */ | 6019 /* Note: composition handling is not yet implemented. */ |
6020 coding->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK; | 6020 coding->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK; |
6021 | 6021 |
6022 if (coding->common_flags & CODING_ANNOTATE_COMPOSITION_MASK) | 6022 if (NILP (coding->src_object)) |
6023 stop = stop_composition = pos; | 6023 stop = stop_composition = stop_charset = end_pos; |
6024 else | 6024 else |
6025 stop = stop_composition = end_pos; | 6025 { |
6026 if (coding->common_flags & CODING_ANNOTATE_CHARSET_MASK) | 6026 if (coding->common_flags & CODING_ANNOTATE_COMPOSITION_MASK) |
6027 stop = stop_charset = pos; | 6027 stop = stop_composition = pos; |
6028 else | 6028 else |
6029 stop_charset = end_pos; | 6029 stop = stop_composition = end_pos; |
6030 if (coding->common_flags & CODING_ANNOTATE_CHARSET_MASK) | |
6031 stop = stop_charset = pos; | |
6032 else | |
6033 stop_charset = end_pos; | |
6034 } | |
6030 | 6035 |
6031 /* Compensate for CRLF and annotation. */ | 6036 /* Compensate for CRLF and annotation. */ |
6032 buf_end -= 1 + MAX_ANNOTATION_LENGTH; | 6037 buf_end -= 1 + MAX_ANNOTATION_LENGTH; |
6033 while (buf < buf_end) | 6038 while (buf < buf_end) |
6034 { | 6039 { |