procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix complementing of a coding system

Browse source
This commit is contained in:
Kenichi Handa 2010-10-02 10:44:50 +09:00
parent 39e266f9bb
commit 1911a33b9d
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/coding.c
View file

@ -6073,10 +6073,9 @@ raw_text_coding_system (coding_system)
}
/* 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
/* 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
@ -6099,6 +6098,8 @@ coding_inherit_eol_type (coding_system, parent)
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;
@ -6132,7 +6133,7 @@ complement_process_encoding_system (coding_system)
if (EQ (coding_type, Qundecided))
{
/* We must decide the text-conversion part. */
/* We must decide the text-conversion part ar first. */
if (CONSP (Vdefault_process_coding_system))
{
coding_system = XCDR (Vdefault_process_coding_system);
@ -6162,7 +6163,7 @@ complement_process_encoding_system (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);
coding_system = coding_inherit_eol_type (coding_system, coding_system);
}
return coding_system;