comparison src/coding.c @ 89462:4e359ebf3984

(decode_coding_iso_2022): Fix handling of invalid bytes. (raw_text_coding_system): Check NILP (coding_system). (coding_inherit_eol_type): Check NILP (coding_system) and NILP (parent). (consume_chars): Fix for the case of raw-text.

89461:108e326323e3

	    {
	      if (ASCII_BYTE_P (*src_base))
		*charbuf++ = *src_base;
	      else
		*charbuf++ = BYTE8_TO_CHAR (*src_base);
	      char_offset++;
	    }
	}
      else if (composition_state == COMPOSING_NO)
	{
	  *charbuf++ = c;

     Lisp_Object coding_system;
{
  Lisp_Object spec, attrs;
  Lisp_Object eol_type, raw_text_eol_type;

  spec = CODING_SYSTEM_SPEC (coding_system);
  attrs = AREF (spec, 0);
  
  if (EQ (CODING_ATTR_TYPE (attrs), Qraw_text))
    return coding_system;

coding_inherit_eol_type (coding_system, parent)
     Lisp_Object coding_system, parent;
{
  Lisp_Object spec, attrs, eol_type;

  spec = CODING_SYSTEM_SPEC (coding_system);
  attrs = AREF (spec, 0);
  eol_type = AREF (spec, 2);
  if (VECTORP (eol_type))
    {
      Lisp_Object parent_spec;
      Lisp_Object parent_eol_type;

      parent_spec

	      else
		*dst++ = CHAR_TO_BYTE8 (c);
	      produced_chars++;
	    }
	  else
	    /* This is an annotation datum.  */
	    buf -= c + 1;
	}
    }
  else
    {
      unsigned char *src = coding->source;

		  ? stop_composition : stop_charset);
	}

      if (! multibytep)
	{
	  EMACS_INT bytes = MULTIBYTE_LENGTH (src, src_end);

	  if (bytes > 0)
	    c = STRING_CHAR_ADVANCE (src), pos += bytes;
	  else
	    c = *src++, pos++;
	}
      else

89462:4e359ebf3984

	    {
	      if (ASCII_BYTE_P (*src_base))
		*charbuf++ = *src_base;
	      else
		*charbuf++ = BYTE8_TO_CHAR (*src_base);
	    }
	}
      else if (composition_state == COMPOSING_NO)
	{
	  *charbuf++ = c;

     Lisp_Object coding_system;
{
  Lisp_Object spec, attrs;
  Lisp_Object eol_type, raw_text_eol_type;

  if (NILP (coding_system))
    return Qraw_text;
  spec = CODING_SYSTEM_SPEC (coding_system);
  attrs = AREF (spec, 0);
  
  if (EQ (CODING_ATTR_TYPE (attrs), Qraw_text))
    return coding_system;

coding_inherit_eol_type (coding_system, parent)
     Lisp_Object coding_system, parent;
{
  Lisp_Object spec, attrs, eol_type;

  if (NILP (coding_system))
    coding_system = Qraw_text;
  spec = CODING_SYSTEM_SPEC (coding_system);
  attrs = AREF (spec, 0);
  eol_type = AREF (spec, 2);
  if (VECTORP (eol_type)
      && ! NILP (parent))
    {
      Lisp_Object parent_spec;
      Lisp_Object parent_eol_type;

      parent_spec

	      else
		*dst++ = CHAR_TO_BYTE8 (c);
	      produced_chars++;
	    }
	  else
	    /* This is an annotation datum.  (-C) is the length of
	       it.  */
	    buf += -c - 1;
	}
    }
  else
    {
      unsigned char *src = coding->source;

		  ? stop_composition : stop_charset);
	}

      if (! multibytep)
	{
	  EMACS_INT bytes;

	  if (! CODING_FOR_UNIBYTE (coding)
	      && (bytes = MULTIBYTE_LENGTH (src, src_end)) > 0)
	    c = STRING_CHAR_ADVANCE (src), pos += bytes;
	  else
	    c = *src++, pos++;
	}
      else