Mercurial > emacs
comparison src/process.c @ 81926:50da0700fc26
(Fstart_process, Fmake_network_process, read_process_output):
Fix up last changes.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 17 Jul 2007 05:57:35 +0000 |
| parents | 349ed3f8d5bb |
| children | b98604865ea0 fd5b4a865d1d a1be62cbd32a |
comparison
equal
deleted
inserted
replaced
| 81925:584ac4db2633 | 81926:50da0700fc26 |
|---|---|
| 1774 XPROCESS (proc)->decoding_buf = make_uninit_string (0); | 1774 XPROCESS (proc)->decoding_buf = make_uninit_string (0); |
| 1775 XPROCESS (proc)->decoding_carryover = 0; | 1775 XPROCESS (proc)->decoding_carryover = 0; |
| 1776 XPROCESS (proc)->encoding_buf = make_uninit_string (0); | 1776 XPROCESS (proc)->encoding_buf = make_uninit_string (0); |
| 1777 | 1777 |
| 1778 XPROCESS (proc)->inherit_coding_system_flag | 1778 XPROCESS (proc)->inherit_coding_system_flag |
| 1779 = (NILP (buffer) || !inherit_process_coding_system); | 1779 = !(NILP (buffer) || !inherit_process_coding_system); |
| 1780 | 1780 |
| 1781 create_process (proc, (char **) new_argv, current_dir); | 1781 create_process (proc, (char **) new_argv, current_dir); |
| 1782 | 1782 |
| 1783 return unbind_to (count, proc); | 1783 return unbind_to (count, proc); |
| 1784 } | 1784 } |
| 3546 p->decoding_buf = make_uninit_string (0); | 3546 p->decoding_buf = make_uninit_string (0); |
| 3547 p->decoding_carryover = 0; | 3547 p->decoding_carryover = 0; |
| 3548 p->encoding_buf = make_uninit_string (0); | 3548 p->encoding_buf = make_uninit_string (0); |
| 3549 | 3549 |
| 3550 p->inherit_coding_system_flag | 3550 p->inherit_coding_system_flag |
| 3551 = (!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); | 3551 = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); |
| 3552 | 3552 |
| 3553 UNGCPRO; | 3553 UNGCPRO; |
| 3554 return proc; | 3554 return proc; |
| 3555 } | 3555 } |
| 3556 #endif /* HAVE_SOCKETS */ | 3556 #endif /* HAVE_SOCKETS */ |
| 5179 p->decoding_buf = make_uninit_string (carryover); | 5179 p->decoding_buf = make_uninit_string (carryover); |
| 5180 bcopy (chars + coding->consumed, SDATA (p->decoding_buf), | 5180 bcopy (chars + coding->consumed, SDATA (p->decoding_buf), |
| 5181 carryover); | 5181 carryover); |
| 5182 p->decoding_carryover = carryover; | 5182 p->decoding_carryover = carryover; |
| 5183 /* Adjust the multibyteness of TEXT to that of the filter. */ | 5183 /* Adjust the multibyteness of TEXT to that of the filter. */ |
| 5184 if (p->filter_multibyte != STRING_MULTIBYTE (text)) | 5184 if (!p->filter_multibyte != !STRING_MULTIBYTE (text)) |
| 5185 text = (STRING_MULTIBYTE (text) | 5185 text = (STRING_MULTIBYTE (text) |
| 5186 ? Fstring_as_unibyte (text) | 5186 ? Fstring_as_unibyte (text) |
| 5187 : Fstring_to_multibyte (text)); | 5187 : Fstring_to_multibyte (text)); |
| 5188 if (SBYTES (text) > 0) | 5188 if (SBYTES (text) > 0) |
| 5189 internal_condition_case_1 (read_process_output_call, | 5189 internal_condition_case_1 (read_process_output_call, |