diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c index 6e633a5825c..de4dbd4a3ff 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -695,6 +695,8 @@ setup_process_coding_systems (process) | |||
| 695 | = (struct coding_system *) xmalloc (sizeof (struct coding_system)); | 695 | = (struct coding_system *) xmalloc (sizeof (struct coding_system)); |
| 696 | setup_coding_system (p->encode_coding_system, | 696 | setup_coding_system (p->encode_coding_system, |
| 697 | proc_encode_coding_system[outch]); | 697 | proc_encode_coding_system[outch]); |
| 698 | if (proc_encode_coding_system[outch]->eol_type == CODING_EOL_UNDECIDED) | ||
| 699 | proc_encode_coding_system[outch]->eol_type = system_eol_type; | ||
| 698 | } | 700 | } |
| 699 | 701 | ||
| 700 | DEFUN ("processp", Fprocessp, Sprocessp, 1, 1, 0, | 702 | DEFUN ("processp", Fprocessp, Sprocessp, 1, 1, 0, |
| @@ -5071,6 +5073,10 @@ read_process_output (proc, channel) | |||
| 5071 | p->encode_coding_system = coding->symbol; | 5073 | p->encode_coding_system = coding->symbol; |
| 5072 | setup_coding_system (coding->symbol, | 5074 | setup_coding_system (coding->symbol, |
| 5073 | proc_encode_coding_system[XINT (p->outfd)]); | 5075 | proc_encode_coding_system[XINT (p->outfd)]); |
| 5076 | if (proc_encode_coding_system[XINT (p->outfd)]->eol_type | ||
| 5077 | == CODING_EOL_UNDECIDED) | ||
| 5078 | proc_encode_coding_system[XINT (p->outfd)]->eol_type | ||
| 5079 | = system_eol_type; | ||
| 5074 | } | 5080 | } |
| 5075 | } | 5081 | } |
| 5076 | 5082 | ||
| @@ -5178,6 +5184,10 @@ read_process_output (proc, channel) | |||
| 5178 | p->encode_coding_system = coding->symbol; | 5184 | p->encode_coding_system = coding->symbol; |
| 5179 | setup_coding_system (coding->symbol, | 5185 | setup_coding_system (coding->symbol, |
| 5180 | proc_encode_coding_system[XINT (p->outfd)]); | 5186 | proc_encode_coding_system[XINT (p->outfd)]); |
| 5187 | if (proc_encode_coding_system[XINT (p->outfd)]->eol_type | ||
| 5188 | == CODING_EOL_UNDECIDED) | ||
| 5189 | proc_encode_coding_system[XINT (p->outfd)]->eol_type | ||
| 5190 | = system_eol_type; | ||
| 5181 | } | 5191 | } |
| 5182 | } | 5192 | } |
| 5183 | carryover = nbytes - coding->consumed; | 5193 | carryover = nbytes - coding->consumed; |
| @@ -5320,6 +5330,8 @@ send_process (proc, buf, len, object) | |||
| 5320 | sending a multibyte text, thus we must encode it by the | 5330 | sending a multibyte text, thus we must encode it by the |
| 5321 | original coding system specified for the current process. */ | 5331 | original coding system specified for the current process. */ |
| 5322 | setup_coding_system (p->encode_coding_system, coding); | 5332 | setup_coding_system (p->encode_coding_system, coding); |
| 5333 | if (coding->eol_type == CODING_EOL_UNDECIDED) | ||
| 5334 | coding->eol_type = system_eol_type; | ||
| 5323 | /* src_multibyte should be set to 1 _after_ a call to | 5335 | /* src_multibyte should be set to 1 _after_ a call to |
| 5324 | setup_coding_system, since it resets src_multibyte to | 5336 | setup_coding_system, since it resets src_multibyte to |
| 5325 | zero. */ | 5337 | zero. */ |