# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 754263211 0
# Node ID 2a1492764d5ef69e2cf9816d1300367129ef4d2e
# Parent  e2ebd4e122796e698b8f05f5c366cce2c5b56efe
(child_setup): Test SETPGRP_RELEASES_CTTY, not IRIX.
(init_callproc): Fix previous change.

diff -r e2ebd4e12279 -r 2a1492764d5e src/callproc.c
--- a/src/callproc.c	Thu Nov 25 19:38:14 1993 +0000
+++ b/src/callproc.c	Thu Nov 25 21:33:31 1993 +0000
@@ -524,13 +524,13 @@
   close (out);
   close (err);
 
-#if !defined (IRIX)
-#if defined (USG)
+#ifdef USG
+#ifndef SETPGRP_RELEASES_CTTY
   setpgrp ();			/* No arguments but equivalent in this case */
+#endif
 #else
   setpgrp (pid, pid);
 #endif /* USG */
-#endif /* IRIX */
   setpgrp_of_tty (pid);
 
 #ifdef vipc
@@ -686,8 +686,8 @@
 				       Vinvocation_directory);
 	      tem2 = Fexpand_file_name (Vdoc_file_name, tem);
 	      tem3 = Ffile_exists_p (tem2);
-	      if (!NILP (tem2))
-		Vdata_directory = tem;
+	      if (!NILP (tem3))
+		Vdata_directory = Ffile_name_as_directory (tem);
 	    }
 	}
     }