[Emacs-diffs]

[Kenichi Handa]

Index: emacs/src/charset.c
diff -c emacs/src/charset.c:1.133 emacs/src/charset.c:1.134
*** emacs/src/charset.c:1.133   Thu Nov 14 09:12:30 2002
--- emacs/src/charset.c Tue Feb  4 09:03:12 2003
***************
*** 210,216 ****
        /* If C still has any modifier bits, just ignore it.  */
        c &= ~CHAR_MODIFIER_MASK;
      }
!   
    if (SINGLE_BYTE_CHAR_P (c))
      {
        if (ASCII_BYTE_P (c) || c >= 0xA0)
--- 210,216 ----
        /* If C still has any modifier bits, just ignore it.  */
        c &= ~CHAR_MODIFIER_MASK;
      }
! 
    if (SINGLE_BYTE_CHAR_P (c))
      {
        if (ASCII_BYTE_P (c) || c >= 0xA0)
***************
*** 345,351 ****
      return 0;
    else if (c >= MAX_CHAR)
      return 0;
!   
    SPLIT_CHAR (c, charset, c1, c2);
    if (! CHARSET_DEFINED_P (charset))
      return 0;
--- 345,351 ----
      return 0;
    else if (c >= MAX_CHAR)
      return 0;
! 
    SPLIT_CHAR (c, charset, c1, c2);
    if (! CHARSET_DEFINED_P (charset))
      return 0;
***************
*** 817,823 ****
            {
              maskbits |= (*ptr < 0x80 ? 1 : *ptr < 0xA0 ? 2 : 4);
              ptr++;
!           }         
  
          if (maskbits & 1)
            charsets[CHARSET_ASCII] = 1;
--- 817,823 ----
            {
              maskbits |= (*ptr < 0x80 ? 1 : *ptr < 0xA0 ? 2 : 4);
              ptr++;
!           }
  
          if (maskbits & 1)
            charsets[CHARSET_ASCII] = 1;
***************
*** 1548,1554 ****
        {
          while (n--)
            *to++ = *p++;
!       }         
        else
        {
          *to++ = LEADING_CODE_8_BIT_CONTROL;
--- 1548,1554 ----
        {
          while (n--)
            *to++ = *p++;
!       }
        else
        {
          *to++ = LEADING_CODE_8_BIT_CONTROL;
***************
*** 1600,1606 ****
    endp = str + len;
    safe_bcopy (p, endp - bytes, bytes);
    p = endp - bytes;
!   while (p < endp)      
      {
        if (*p < 0x80 || *p >= 0xA0)
        *to++ = *p++;
--- 1600,1606 ----
    endp = str + len;
    safe_bcopy (p, endp - bytes, bytes);
    p = endp - bytes;
!   while (p < endp)
      {
        if (*p < 0x80 || *p >= 0xA0)
        *to++ = *p++;
***************
*** 1624,1630 ****
  
    while (p < endp && *p != LEADING_CODE_8_BIT_CONTROL) p++;
    to = p;
!   while (p < endp)      
      {
        if (*p == LEADING_CODE_8_BIT_CONTROL)
        *to++ = *(p + 1) - 0x20, p += 2;
--- 1624,1630 ----
  
    while (p < endp && *p != LEADING_CODE_8_BIT_CONTROL) p++;
    to = p;
!   while (p < endp)
      {
        if (*p == LEADING_CODE_8_BIT_CONTROL)
        *to++ = *(p + 1) - 0x20, p += 2;