comparison src/process.c @ 90984:a1be62cbd32a

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 814-815) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-232
author Miles Bader <miles@gnu.org>
date Wed, 18 Jul 2007 22:15:15 +0000
parents a66921565bcb 50da0700fc26
children f55f9811f5d7
comparison
equal deleted inserted replaced
90983:8cdd8b5fa891 90984:a1be62cbd32a
1773 XPROCESS (proc)->decoding_buf = make_uninit_string (0); 1773 XPROCESS (proc)->decoding_buf = make_uninit_string (0);
1774 XPROCESS (proc)->decoding_carryover = 0; 1774 XPROCESS (proc)->decoding_carryover = 0;
1775 XPROCESS (proc)->encoding_buf = make_uninit_string (0); 1775 XPROCESS (proc)->encoding_buf = make_uninit_string (0);
1776 1776
1777 XPROCESS (proc)->inherit_coding_system_flag 1777 XPROCESS (proc)->inherit_coding_system_flag
1778 = (NILP (buffer) || !inherit_process_coding_system); 1778 = !(NILP (buffer) || !inherit_process_coding_system);
1779 1779
1780 create_process (proc, (char **) new_argv, current_dir); 1780 create_process (proc, (char **) new_argv, current_dir);
1781 1781
1782 return unbind_to (count, proc); 1782 return unbind_to (count, proc);
1783 } 1783 }
3545 p->decoding_buf = make_uninit_string (0); 3545 p->decoding_buf = make_uninit_string (0);
3546 p->decoding_carryover = 0; 3546 p->decoding_carryover = 0;
3547 p->encoding_buf = make_uninit_string (0); 3547 p->encoding_buf = make_uninit_string (0);
3548 3548
3549 p->inherit_coding_system_flag 3549 p->inherit_coding_system_flag
3550 = (!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); 3550 = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system);
3551 3551
3552 UNGCPRO; 3552 UNGCPRO;
3553 return proc; 3553 return proc;
3554 } 3554 }
3555 #endif /* HAVE_SOCKETS */ 3555 #endif /* HAVE_SOCKETS */
5174 bcopy (coding->carryover, SDATA (p->decoding_buf), 5174 bcopy (coding->carryover, SDATA (p->decoding_buf),
5175 coding->carryover_bytes); 5175 coding->carryover_bytes);
5176 p->decoding_carryover = coding->carryover_bytes; 5176 p->decoding_carryover = coding->carryover_bytes;
5177 } 5177 }
5178 /* Adjust the multibyteness of TEXT to that of the filter. */ 5178 /* Adjust the multibyteness of TEXT to that of the filter. */
5179 if (p->filter_multibyte != STRING_MULTIBYTE (text)) 5179 if (!p->filter_multibyte != !STRING_MULTIBYTE (text))
5180 text = (STRING_MULTIBYTE (text) 5180 text = (STRING_MULTIBYTE (text)
5181 ? Fstring_as_unibyte (text) 5181 ? Fstring_as_unibyte (text)
5182 : Fstring_to_multibyte (text)); 5182 : Fstring_to_multibyte (text));
5183 if (SBYTES (text) > 0) 5183 if (SBYTES (text) > 0)
5184 internal_condition_case_1 (read_process_output_call, 5184 internal_condition_case_1 (read_process_output_call,