aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorJoakim Verona2013-08-16 07:26:31 +0200
committerJoakim Verona2013-08-16 07:26:31 +0200
commit55dff340dfea1812fb55d27428ae708f094cb7a2 (patch)
treed9d2e8615704ed0930c154dc60466693ad4d8955 /src/process.c
parent6d2a4fc753d8533b4124fe59432bf4991c1db6b7 (diff)
parent526e5233cc0e2375798bdc79329a893302fdfb4b (diff)
downloademacs-55dff340dfea1812fb55d27428ae708f094cb7a2.tar.gz
emacs-55dff340dfea1812fb55d27428ae708f094cb7a2.zip
merge from trunk
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/process.c b/src/process.c
index 892a5aa86c5..64cb401c06a 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1893,7 +1893,7 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
1893#ifndef WINDOWSNT 1893#ifndef WINDOWSNT
1894 /* Wait for child_setup to complete in case that vfork is 1894 /* Wait for child_setup to complete in case that vfork is
1895 actually defined as fork. The descriptor 1895 actually defined as fork. The descriptor
1896 XPROCESS (proc)->open_fd[EXEC_MOINTOR_OUTPUT] 1896 XPROCESS (proc)->open_fd[EXEC_MONITOR_OUTPUT]
1897 of a pipe is closed at the child side either by close-on-exec 1897 of a pipe is closed at the child side either by close-on-exec
1898 on successful execve or the _exit call in child_setup. */ 1898 on successful execve or the _exit call in child_setup. */
1899 { 1899 {