1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-20 04:30:55 -08:00

(setup_coding_system): Fix setting of

coding->common_flags based on eol_type.
(coding_inherit_eol_type): If PARENT is not nil, be sure to
inherit from it.
This commit is contained in:
Kenichi Handa 2006-08-21 12:48:22 +00:00
parent 066f434419
commit 4a015c451a

View file

@ -4963,8 +4963,14 @@ setup_coding_system (coding_system, coding)
coding->mode = 0;
coding->head_ascii = -1;
coding->common_flags
= (VECTORP (eol_type) ? CODING_REQUIRE_DETECTION_MASK : 0);
if (VECTORP (eol_type))
coding->common_flags = (CODING_REQUIRE_DECODING_MASK
| CODING_REQUIRE_DETECTION_MASK);
else if (! EQ (eol_type, Qunix))
coding->common_flags = (CODING_REQUIRE_DECODING_MASK
| CODING_REQUIRE_ENCODING_MASK);
else
coding->common_flags = 0;
if (! NILP (CODING_ATTR_POST_READ (attrs)))
coding->common_flags |= CODING_REQUIRE_DECODING_MASK;
if (! NILP (CODING_ATTR_PRE_WRITE (attrs)))
@ -5202,8 +5208,7 @@ coding_inherit_eol_type (coding_system, parent)
{
Lisp_Object parent_spec;
parent_spec
= CODING_SYSTEM_SPEC (buffer_defaults.buffer_file_coding_system);
parent_spec = CODING_SYSTEM_SPEC (parent);
parent_eol_type = AREF (parent_spec, 2);
}
else