[Emacs-diffs] Changes to emacs/src/coding.c [emacs-unicode-2]

[Kenichi Handa]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.289.2.3 emacs/src/coding.c:1.289.2.4
*** emacs/src/coding.c:1.289.2.3        Mon Sep 29 13:59:52 2003
--- emacs/src/coding.c  Wed Oct  1 00:40:19 2003
***************
*** 6019,6032 ****
    /* 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;
    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;
--- 6019,6037 ----
    /* Note: composition handling is not yet implemented.  */
    coding->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK;
  
!   if (NILP (coding->src_object))
!     stop = stop_composition = stop_charset = end_pos;
    else
!     {
!       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;