aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-05-15 02:47:29 +0000
committerKenichi Handa2006-05-15 02:47:29 +0000
commitb4413d9ff58177bf3ef4c8b713ecc5a656632d34 (patch)
treee097d6b75b859f27e5e3a2fa35fb7dab65d9fc14 /src
parent76d812bb69858985591eec05cfb2f1e1ea30dd91 (diff)
downloademacs-b4413d9ff58177bf3ef4c8b713ecc5a656632d34.tar.gz
emacs-b4413d9ff58177bf3ef4c8b713ecc5a656632d34.zip
(Fcall_process): Sync with HEAD.
Diffstat (limited to 'src')
-rw-r--r--src/callproc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 5f314f4de2a..7fd601f4b05 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -294,9 +294,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
294 else 294 else
295 val = Qnil; 295 val = Qnil;
296 } 296 }
297 val = coding_inherit_eol_type (val, Qnil);
297 setup_coding_system (Fcheck_coding_system (val), &argument_coding); 298 setup_coding_system (Fcheck_coding_system (val), &argument_coding);
298 if (argument_coding.eol_type == CODING_EOL_UNDECIDED)
299 argument_coding.eol_type = system_eol_type;
300 } 299 }
301 } 300 }
302 301