From: Kenichi Handa <handa@m17n.org>
Date: Thu, 8 Jun 2006 07:08:36 +0000 (+0000)
Subject: (Fcall_process): Sync with HEAD.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~916
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e50da0a627ef1fd2b4bfd0c7a8be642e36a52e9;p=emacs.git

(Fcall_process): Sync with HEAD.
---

diff --git a/src/callproc.c b/src/callproc.c
index 7fd601f4b05..4fcf2ec0eda 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -269,6 +269,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
     if (nargs >= 5)
       {
 	int must_encode = 0;
+	Lisp_Object coding_attrs;
 
 	for (i = 4; i < nargs; i++)
 	  CHECK_STRING (args[i]);
@@ -296,6 +297,13 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 	  }
 	val = coding_inherit_eol_type (val, Qnil);
 	setup_coding_system (Fcheck_coding_system (val), &argument_coding);
+	coding_attrs = CODING_ID_ATTRS (argument_coding.id);
+	if (NILP (CODING_ATTR_ASCII_COMPAT (coding_attrs)))
+	  {
+	    /* We should not use an ASCII incompatible coding system.  */
+	    val = raw_text_coding_system (val);
+	    setup_coding_system (val, &argument_coding);
+	  }
       }
   }