From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 23 Jun 1998 03:07:05 +0000 (+0000)
Subject: (Fcall_process): Handle third argument BUFFER
X-Git-Tag: emacs-20.3~529
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3ffde7d6913260ec054fa8711ddb8186632addd2;p=emacs.git

(Fcall_process): Handle third argument BUFFER
consistently when it is an integer or a list.
---

diff --git a/src/callproc.c b/src/callproc.c
index a49da6dde3c..a76db5ba4b1 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -227,7 +227,8 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
 
 #ifndef subprocesses
   /* Without asynchronous processes we cannot have BUFFER == 0.  */
-  if (nargs >= 3 && INTEGERP (args[2]))
+  if (nargs >= 3 
+      && (INTEGERP (CONSP (args[2]) ? XCAR (args[2]) : args[2])
     error ("Operating system cannot handle asynchronous subprocesses");
 #endif /* subprocesses */
 
@@ -271,9 +272,10 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
     /* If BUFFER is nil, we must read process output once and then
        discard it, so setup coding system but with nil.  If BUFFER is
        an integer, we can discard it without reading.  */
-    if (nargs < 3 || NILP (args[2]))
+    if (nargs < 3 || NILP (args[2])
+	|| (CONSP (args[2]) && NILP (XCAR (args[2]))))
       setup_coding_system (Qnil, &process_coding);
-    else if (!INTEGERP (args[2]))
+    else if (!INTEGERP (CONSP (args[2]) ? XCAR (args[2]) : args[2]))
       {
 	val = Qnil;
 	if (!NILP (Vcoding_system_for_read))
@@ -333,7 +335,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
 
       if (!(EQ (buffer, Qnil)
 	    || EQ (buffer, Qt)
-	    || XFASTINT (buffer) == 0))
+	    || INTEGERP (buffer)))
 	{
 	  Lisp_Object spec_buffer;
 	  spec_buffer = buffer;