aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2009-04-29 05:15:47 +0000
committerYAMAMOTO Mitsuharu2009-04-29 05:15:47 +0000
commit7e3386cbfd873df3a037c261e6996e070bb8a0c3 (patch)
tree64217d07b70e3b672e6e813900df88bf7b8b84b6 /src/process.c
parent753bc4f6500383c347daa5d85c7023eee370d45c (diff)
downloademacs-7e3386cbfd873df3a037c261e6996e070bb8a0c3.tar.gz
emacs-7e3386cbfd873df3a037c261e6996e070bb8a0c3.zip
(create_process): Clean up merger residues of 2008-07-17 change.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c8
1 files changed, 0 insertions, 8 deletions
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)
1875#endif 1875#endif
1876 if (forkin < 0) 1876 if (forkin < 0)
1877 report_file_error ("Opening pty", Qnil); 1877 report_file_error ("Opening pty", Qnil);
1878#if defined (DONT_REOPEN_PTY)
1879 /* In the case that vfork is defined as fork, the parent process
1880 (Emacs) may send some data before the child process completes
1881 tty options setup. So we setup tty before forking. */
1882 child_setup_tty (forkout);
1883#endif /* DONT_REOPEN_PTY */
1884#else 1878#else
1885 forkin = forkout = -1; 1879 forkin = forkout = -1;
1886#endif /* not USG, or USG_SUBTTY_WORKS */ 1880#endif /* not USG, or USG_SUBTTY_WORKS */
@@ -2151,10 +2145,8 @@ create_process (process, new_argv, current_dir)
2151#endif /* SIGCHLD */ 2145#endif /* SIGCHLD */
2152#endif /* !POSIX_SIGNALS */ 2146#endif /* !POSIX_SIGNALS */
2153 2147
2154#if !defined (DONT_REOPEN_PTY)
2155 if (pty_flag) 2148 if (pty_flag)
2156 child_setup_tty (xforkout); 2149 child_setup_tty (xforkout);
2157#endif /* not DONT_REOPEN_PTY */
2158#ifdef WINDOWSNT 2150#ifdef WINDOWSNT
2159 pid = child_setup (xforkin, xforkout, xforkout, 2151 pid = child_setup (xforkin, xforkout, xforkout,
2160 new_argv, 1, current_dir); 2152 new_argv, 1, current_dir);