diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2009-04-29 05:15:47 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2009-04-29 05:15:47 +0000 |
| commit | 7e3386cbfd873df3a037c261e6996e070bb8a0c3 (patch) | |
| tree | 64217d07b70e3b672e6e813900df88bf7b8b84b6 | |
| parent | 753bc4f6500383c347daa5d85c7023eee370d45c (diff) | |
| download | emacs-7e3386cbfd873df3a037c261e6996e070bb8a0c3.tar.gz | |
(create_process): Clean up merger residues of 2008-07-17 change.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/process.c | 8 |
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); |