aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2007-07-17 05:57:35 +0000
committerStefan Monnier2007-07-17 05:57:35 +0000
commite6fca8436381da19684f51d6942437598130b5c3 (patch)
tree3f32976c09443488a53fd42cf6b1787c97163496 /src
parent8c58e784d8a3d273adbeb65aff04231209867982 (diff)
downloademacs-e6fca8436381da19684f51d6942437598130b5c3.tar.gz
emacs-e6fca8436381da19684f51d6942437598130b5c3.zip
(Fstart_process, Fmake_network_process, read_process_output):
Fix up last changes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/process.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ac1a040761b..5450efd6728 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-07-17 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * process.c (Fstart_process, Fmake_network_process)
4 (read_process_output): Fix up last changes.
5
12007-07-16 Eli Zaretskii <eliz@gnu.org> 62007-07-16 Eli Zaretskii <eliz@gnu.org>
2 7
3 * makefile.w32-in (clean): Don't delete *~. 8 * 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) */)
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
@@ -3548,7 +3548,7 @@ usage: (make-network-process &rest ARGS) */)
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;
@@ -5181,7 +5181,7 @@ read_process_output (proc, channel)
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));