(Fcall_process): Sync with HEAD.

diff --git a/src/callproc.c b/src/callproc.c
index 5f314f4de2ac30fb043fc5b498b8dc9f351ab45f..7fd601f4b059e2455b213aecf66447d56caed298 100644 (file)
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -294,9 +294,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
            else
              val = Qnil;
          }
+       val = coding_inherit_eol_type (val, Qnil);
        setup_coding_system (Fcheck_coding_system (val), &argument_coding);
-       if (argument_coding.eol_type == CODING_EOL_UNDECIDED)
-         argument_coding.eol_type = system_eol_type;
       }
   }