Commit fdba8590 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(child_setup): Test SETPGRP_RELEASES_CTTY, not IRIX.

(init_callproc): Fix previous change.
parent 0dfcc832
...@@ -524,13 +524,13 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) ...@@ -524,13 +524,13 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir)
close (out); close (out);
close (err); close (err);
#if !defined (IRIX) #ifdef USG
#if defined (USG) #ifndef SETPGRP_RELEASES_CTTY
setpgrp (); /* No arguments but equivalent in this case */ setpgrp (); /* No arguments but equivalent in this case */
#endif
#else #else
setpgrp (pid, pid); setpgrp (pid, pid);
#endif /* USG */ #endif /* USG */
#endif /* IRIX */
setpgrp_of_tty (pid); setpgrp_of_tty (pid);
#ifdef vipc #ifdef vipc
...@@ -686,8 +686,8 @@ init_callproc () ...@@ -686,8 +686,8 @@ init_callproc ()
Vinvocation_directory); Vinvocation_directory);
tem2 = Fexpand_file_name (Vdoc_file_name, tem); tem2 = Fexpand_file_name (Vdoc_file_name, tem);
tem3 = Ffile_exists_p (tem2); tem3 = Ffile_exists_p (tem2);
if (!NILP (tem2)) if (!NILP (tem3))
Vdata_directory = tem; Vdata_directory = Ffile_name_as_directory (tem);
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment