mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-20 20:50:53 -08:00
Code Issues Projects Releases Wiki Activity

(consume_chars): If coding->src_object is nil, don't check annotation.

Browse source
This commit is contained in:
Kenichi Handa 2003-10-01 04:40:19 +00:00
parent fa85a32548
commit 0b5670c996
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/coding.c
View file

@ -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;