From fdba859084232e8f8a0c571086d1242c749b48c4 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 25 Nov 1993 21:33:31 +0000 Subject: [PATCH] (child_setup): Test SETPGRP_RELEASES_CTTY, not IRIX. (init_callproc): Fix previous change. --- src/callproc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/callproc.c b/src/callproc.c index bd60d942552..8d43ffe67f3 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -524,13 +524,13 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) 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 @@ init_callproc () 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); } } } -- 2.39.5