Mercurial > emacs
changeset 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 | 584ac4db2633 |
| children | 23646becfdf9 |
| files | src/ChangeLog src/process.c |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Jul 17 05:33:17 2007 +0000 +++ b/src/ChangeLog Tue Jul 17 05:57:35 2007 +0000 @@ -1,3 +1,8 @@ +2007-07-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * process.c (Fstart_process, Fmake_network_process) + (read_process_output): Fix up last changes. + 2007-07-16 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (clean): Don't delete *~.
--- a/src/process.c Tue Jul 17 05:33:17 2007 +0000 +++ b/src/process.c Tue Jul 17 05:57:35 2007 +0000 @@ -1776,7 +1776,7 @@ 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 @@ 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 @@ 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));