Mercurial > emacs

diff src/callproc.c @ 5179:2a1492764d5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(child_setup): Test SETPGRP_RELEASES_CTTY, not IRIX. (init_callproc): Fix previous change.
author Richard M. Stallman <rms@gnu.org>
date Thu, 25 Nov 1993 21:33:31 +0000
parents e4e66bcaa016
children 480731ff8e9a
line wrap: on
line diff
--- 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);
 	    }
 	}
     }