From: Stefan Monnier Date: Tue, 17 Jul 2007 05:57:35 +0000 (+0000) Subject: (Fstart_process, Fmake_network_process, read_process_output): X-Git-Tag: emacs-pretest-23.0.90~11874 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e6fca8436381da19684f51d6942437598130b5c3;p=emacs.git (Fstart_process, Fmake_network_process, read_process_output): Fix up last changes. --- diff --git a/src/ChangeLog b/src/ChangeLog index ac1a040761b..5450efd6728 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-07-17 Stefan Monnier + + * process.c (Fstart_process, Fmake_network_process) + (read_process_output): Fix up last changes. + 2007-07-16 Eli Zaretskii * makefile.w32-in (clean): Don't delete *~. diff --git a/src/process.c b/src/process.c index 5f96467a681..e588b3bc3ab 100644 --- a/src/process.c +++ b/src/process.c @@ -1776,7 +1776,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) XPROCESS (proc)->encoding_buf = make_uninit_string (0); XPROCESS (proc)->inherit_coding_system_flag - = (NILP (buffer) || !inherit_process_coding_system); + = !(NILP (buffer) || !inherit_process_coding_system); create_process (proc, (char **) new_argv, current_dir); @@ -3548,7 +3548,7 @@ usage: (make-network-process &rest ARGS) */) p->encoding_buf = make_uninit_string (0); p->inherit_coding_system_flag - = (!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); + = !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system); UNGCPRO; return proc; @@ -5181,7 +5181,7 @@ read_process_output (proc, channel) carryover); p->decoding_carryover = carryover; /* Adjust the multibyteness of TEXT to that of the filter. */ - if (p->filter_multibyte != STRING_MULTIBYTE (text)) + if (!p->filter_multibyte != !STRING_MULTIBYTE (text)) text = (STRING_MULTIBYTE (text) ? Fstring_as_unibyte (text) : Fstring_to_multibyte (text));