(create_process): Clean up merger residues of 2008-07-17 change.

2 files changed, 3 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 691ce28ee93..17b0a91a17f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,9 @@
 
         * keyboard.c (init_keyboard) [POLL_FOR_INPUT]: Reset poll_timer.
 
+        * process.c (create_process): Clean up merger residues of
+        2008-07-17 change.
+
 2009-04-29  Ulrich Mueller  <ulm@gentoo.org>
 
         * lread.c (Vread_circle): New variable.
diff --git a/src/process.c b/src/process.c
index 3e06b4d5fdb..635f44466df 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1875,12 +1875,6 @@ create_process (process, new_argv, current_dir)
 #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 @@ create_process (process, new_argv, current_dir)
 #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);