comparison src/coding.c @ 110834:b997f43af473

Fix complementing of a coding system

110830:4665df4accaa

	  : EQ (eol_type, Qdos) ? AREF (raw_text_eol_type, 1)
	  : AREF (raw_text_eol_type, 2));
}


/* If CODING_SYSTEM doesn't specify end-of-line format but PARENT
   does, return one of the subsidiary that has the same eol-spec as
   PARENT.  Otherwise, return CODING_SYSTEM.  If PARENT is nil,
   inherit end-of-line format from the system's setting
   (system_eol_type).  */

Lisp_Object
coding_inherit_eol_type (coding_system, parent)
     Lisp_Object coding_system, parent;

	{
	  Lisp_Object parent_spec;

	  parent_spec = CODING_SYSTEM_SPEC (parent);
	  parent_eol_type = AREF (parent_spec, 2);
	}
      else
	parent_eol_type = system_eol_type;
      if (EQ (parent_eol_type, Qunix))
	coding_system = AREF (eol_type, 0);

  coding_type = CODING_ATTR_TYPE (attrs);
  eol_type = AREF (spec, 2);

  if (EQ (coding_type, Qundecided))
    {
      /* We must decide the text-conversion part.  */
      if (CONSP (Vdefault_process_coding_system))
	{
	  coding_system = XCDR (Vdefault_process_coding_system);
	  if (! NILP (coding_system))
	    {

	}
    }
  if (NILP (eol_type) || VECTORP (eol_type))
    {
      /* We must decide the eol-conversion part.  */      
      coding_system = coding_inherit_eol_type (coding_system, Qnil);
    }

  return coding_system;
}

110834:b997f43af473

	  : EQ (eol_type, Qdos) ? AREF (raw_text_eol_type, 1)
	  : AREF (raw_text_eol_type, 2));
}


/* If CODING_SYSTEM doesn't specify end-of-line format, return one of
   the subsidiary that has the same eol-spec as PARENT (if it is not
   nil and specifies end-of-line format) or the system's setting
   (system_eol_type).  */

Lisp_Object
coding_inherit_eol_type (coding_system, parent)
     Lisp_Object coding_system, parent;

	{
	  Lisp_Object parent_spec;

	  parent_spec = CODING_SYSTEM_SPEC (parent);
	  parent_eol_type = AREF (parent_spec, 2);
	  if (VECTORP (parent_eol_type))
	    parent_eol_type = system_eol_type;	    
	}
      else
	parent_eol_type = system_eol_type;
      if (EQ (parent_eol_type, Qunix))
	coding_system = AREF (eol_type, 0);

  coding_type = CODING_ATTR_TYPE (attrs);
  eol_type = AREF (spec, 2);

  if (EQ (coding_type, Qundecided))
    {
      /* We must decide the text-conversion part ar first.  */
      if (CONSP (Vdefault_process_coding_system))
	{
	  coding_system = XCDR (Vdefault_process_coding_system);
	  if (! NILP (coding_system))
	    {

	}
    }
  if (NILP (eol_type) || VECTORP (eol_type))
    {
      /* We must decide the eol-conversion part.  */      
      coding_system = coding_inherit_eol_type (coding_system, coding_system);
    }

  return coding_system;
}