diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-11-25 21:33:31 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-11-25 21:33:31 +0000 |
| commit | 76c12cd7afb4e7a1206e4a2aa3e04f45ac97568d (patch) | |
| tree | a925ecafd5379e51fd41fd588023cbdcda0e68ae /src/callproc.c | |
| parent | 2cbc76a786e431fd81d10cde0e38a69a82aa6a64 (diff) | |
| download | emacs-76c12cd7afb4e7a1206e4a2aa3e04f45ac97568d.tar.gz | |
(child_setup): Test SETPGRP_RELEASES_CTTY, not IRIX.
(init_callproc): Fix previous change.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 10 |
1 files 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); } } } |