# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1240982134 0
# Node ID e61fae00d13e55562e5d1257441deec51ed73e58
# Parent  15fc92c2fca63502b9baa9c4ae099935c1fd7a47
(create_process): Clean up merger residues of 2008-07-17 change.

diff -r 15fc92c2fca6 -r e61fae00d13e src/process.c
--- a/src/process.c	Wed Apr 29 04:46:15 2009 +0000
+++ b/src/process.c	Wed Apr 29 05:15:34 2009 +0000
@@ -1875,12 +1875,6 @@
 #endif
       if (forkin < 0)
 	report_file_error ("Opening pty", Qnil);
-#if defined (DONT_REOPEN_PTY)
-      /* In the case that vfork is defined as fork, the parent process
-	 (Emacs) may send some data before the child process completes
-	 tty options setup.  So we setup tty before forking.  */
-      child_setup_tty (forkout);
-#endif /* DONT_REOPEN_PTY */
 #else
       forkin = forkout = -1;
 #endif /* not USG, or USG_SUBTTY_WORKS */
@@ -2151,10 +2145,8 @@
 #endif /* SIGCHLD */
 #endif /* !POSIX_SIGNALS */
 
-#if !defined (DONT_REOPEN_PTY)
 	if (pty_flag)
 	  child_setup_tty (xforkout);
-#endif /* not DONT_REOPEN_PTY */
 #ifdef WINDOWSNT
 	pid = child_setup (xforkin, xforkout, xforkout,
 			   new_argv, 1, current_dir);