Mercurial > emacs
changeset 90392:8b24a6ec5090
(setup_process_coding_systems): Fix synching with
HEAD.
(read_process_output): Likewise.
(Fset_process_coding_system): Inherit system's eol format if
necessary.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 15 May 2006 02:47:05 +0000 |
| parents | bcc2042feec2 |
| children | 6592da24d351 |
| files | src/process.c |
| diffstat | 1 files changed, 5 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/process.c Mon May 15 02:45:49 2006 +0000 +++ b/src/process.c Mon May 15 02:47:05 2006 +0000 @@ -696,8 +696,6 @@ = (struct coding_system *) xmalloc (sizeof (struct coding_system)); setup_coding_system (p->encode_coding_system, proc_encode_coding_system[outch]); - if (proc_encode_coding_system[outch]->eol_type == CODING_EOL_UNDECIDED) - proc_encode_coding_system[outch]->eol_type = system_eol_type; } DEFUN ("processp", Fprocessp, Sprocessp, 1, 1, 0, @@ -5066,13 +5064,10 @@ if (NILP (p->encode_coding_system) && proc_encode_coding_system[XINT (p->outfd)]) { - p->encode_coding_system = Vlast_coding_system_used; + p->encode_coding_system + = coding_inherit_eol_type (Vlast_coding_system_used, Qnil); setup_coding_system (p->encode_coding_system, proc_encode_coding_system[XINT (p->outfd)]); - if (proc_encode_coding_system[XINT (p->outfd)]->eol_type - == CODING_EOL_UNDECIDED) - proc_encode_coding_system[XINT (p->outfd)]->eol_type - = system_eol_type; } } @@ -5179,13 +5174,10 @@ if (NILP (p->encode_coding_system) && proc_encode_coding_system[XINT (p->outfd)]) { - p->encode_coding_system = Vlast_coding_system_used; + p->encode_coding_system + = coding_inherit_eol_type (Vlast_coding_system_used, Qnil); setup_coding_system (p->encode_coding_system, proc_encode_coding_system[XINT (p->outfd)]); - if (proc_encode_coding_system[XINT (p->outfd)]->eol_type - == CODING_EOL_UNDECIDED) - proc_encode_coding_system[XINT (p->outfd)]->eol_type - = system_eol_type; } } if (coding->carryover_bytes > 0) @@ -6698,7 +6690,7 @@ error ("Output file descriptor of %s closed", SDATA (p->name)); Fcheck_coding_system (decoding); Fcheck_coding_system (encoding); - + encoding = coding_inherit_eol_type (encoding, Qnil); p->decode_coding_system = decoding; p->encode_coding_system = encoding; setup_process_coding_systems (process);