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

[Pavel Janík]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.233 emacs/src/coding.c:1.234
*** emacs/src/coding.c:1.233    Thu Nov 29 07:54:12 2001
--- emacs/src/coding.c  Sat Dec  8 19:56:24 2001
***************
*** 3576,3583 ****
            = CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION;
        for (i = 0; i < 4; i++)
          {
!           if (INTEGERP (flags[i])
!               && (charset = XINT (flags[i]), CHARSET_VALID_P (charset))
                || (charset = get_charset_id (flags[i])) >= 0)
              {
                CODING_SPEC_ISO_INITIAL_DESIGNATION (coding, i) = charset;
--- 3576,3583 ----
            = CODING_SPEC_ISO_NO_REQUESTED_DESIGNATION;
        for (i = 0; i < 4; i++)
          {
!           if ((INTEGERP (flags[i])
!                && (charset = XINT (flags[i]), CHARSET_VALID_P (charset)))
                || (charset = get_charset_id (flags[i])) >= 0)
              {
                CODING_SPEC_ISO_INITIAL_DESIGNATION (coding, i) = charset;
***************
*** 3595,3603 ****
                tail = flags[i];
  
                coding->flags |= CODING_FLAG_ISO_DESIGNATION;
!               if (INTEGERP (XCAR (tail))
!                   && (charset = XINT (XCAR (tail)),
!                       CHARSET_VALID_P (charset))
                    || (charset = get_charset_id (XCAR (tail))) >= 0)
                  {
                    CODING_SPEC_ISO_INITIAL_DESIGNATION (coding, i) = charset;
--- 3595,3603 ----
                tail = flags[i];
  
                coding->flags |= CODING_FLAG_ISO_DESIGNATION;
!               if ((INTEGERP (XCAR (tail))
!                    && (charset = XINT (XCAR (tail)),
!                        CHARSET_VALID_P (charset)))
                    || (charset = get_charset_id (XCAR (tail))) >= 0)
                  {
                    CODING_SPEC_ISO_INITIAL_DESIGNATION (coding, i) = charset;
***************
*** 3608,3616 ****
                tail = XCDR (tail);
                while (CONSP (tail))
                  {
!                   if (INTEGERP (XCAR (tail))
!                       && (charset = XINT (XCAR (tail)),
!                           CHARSET_VALID_P (charset))
                        || (charset = get_charset_id (XCAR (tail))) >= 0)
                      CODING_SPEC_ISO_REQUESTED_DESIGNATION (coding, charset)
                        = i;
--- 3608,3616 ----
                tail = XCDR (tail);
                while (CONSP (tail))
                  {
!                   if ((INTEGERP (XCAR (tail))
!                        && (charset = XINT (XCAR (tail)),
!                            CHARSET_VALID_P (charset)))
                        || (charset = get_charset_id (XCAR (tail))) >= 0)
                      CODING_SPEC_ISO_REQUESTED_DESIGNATION (coding, charset)
                        = i;
***************
*** 5047,5053 ****
    if (coding->type == coding_type_ccl
        || coding->eol_type == CODING_EOL_CRLF
        || coding->eol_type == CODING_EOL_CR
!       || coding->cmp_data && coding->cmp_data->used > 0)
      {
        /* We can't skip any data.  */
        return;
--- 5047,5053 ----
    if (coding->type == coding_type_ccl
        || coding->eol_type == CODING_EOL_CRLF
        || coding->eol_type == CODING_EOL_CR
!       || (coding->cmp_data && coding->cmp_data->used > 0))
      {
        /* We can't skip any data.  */
        return;
***************
*** 6606,6612 ****
      }
    else
      {
!       if ((s1 < 0x80 || s1 > 0x9F && s1 < 0xE0 || s1 > 0xEF)
          || (s2 < 0x40 || s2 == 0x7F || s2 > 0xFC))
        error ("Invalid Shift JIS code: %x", XFASTINT (code));
        DECODE_SJIS (s1, s2, c1, c2);
--- 6606,6612 ----
      }
    else
      {
!       if ((s1 < 0x80 || (s1 > 0x9F && s1 < 0xE0) || s1 > 0xEF)
          || (s2 < 0x40 || s2 == 0x7F || s2 > 0xFC))
        error ("Invalid Shift JIS code: %x", XFASTINT (code));
        DECODE_SJIS (s1, s2, c1, c2);