aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-04-06 14:52:57 +0300
committerEli Zaretskii2015-04-06 14:52:57 +0300
commitd521417bf74f46857fb5bee5e601f3d8db633686 (patch)
tree2495f50cffd14426d6b68b48de5b316e6b177183
parenta51bcf831ab85bb5e6252857c9a11863e12cc52e (diff)
downloademacs-d521417bf74f46857fb5bee5e601f3d8db633686.tar.gz
emacs-d521417bf74f46857fb5bee5e601f3d8db633686.zip
src/w32proc.c: Fix typos in description of subprocess support.
-rw-r--r--src/w32proc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/w32proc.c b/src/w32proc.c
index 9f699ccf65b..1f633d834c2 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -806,7 +806,7 @@ alarm (int seconds)
806 etc. 806 etc.
807 807
808 Both these arrays reference each other: there's a member of 808 Both these arrays reference each other: there's a member of
809 child_process structure that records the file corresponding 809 child_process structure that records the corresponding file
810 descriptor, and there's a member of filedesc structure that holds a 810 descriptor, and there's a member of filedesc structure that holds a
811 pointer to the corresponding child_process. 811 pointer to the corresponding child_process.
812 812
@@ -817,13 +817,13 @@ alarm (int seconds)
817 thread" that will watch the output of the subprocess/stream and its 817 thread" that will watch the output of the subprocess/stream and its
818 status. (If no vacant slot can be found, new_child returns a 818 status. (If no vacant slot can be found, new_child returns a
819 failure indication to its caller, and the higher-level Emacs 819 failure indication to its caller, and the higher-level Emacs
820 primitive will then fail with EMFILE or EAGAIN.) 820 primitive that called it will then fail with EMFILE or EAGAIN.)
821 821
822 The reader thread started by new_child communicates with the main 822 The reader thread started by new_child communicates with the main
823 (a.k.a. "Lisp") thread via two event objects and a status, all of 823 (a.k.a. "Lisp") thread via two event objects and a status, all of
824 them recorded by the members of the child_process structure in 824 them recorded by the members of the child_process structure in
825 child_procs[]. The event objects serve as semaphores between the 825 child_procs[]. The event objects serve as semaphores between the
826 reader thread and the 'select' emulation in sys_select, as follows: 826 reader thread and the 'pselect' emulation in sys_select, as follows:
827 827
828 . Initially, the reader thread is waiting for the char_consumed 828 . Initially, the reader thread is waiting for the char_consumed
829 event to become signaled by sys_select, which is an indication 829 event to become signaled by sys_select, which is an indication
@@ -841,8 +841,8 @@ alarm (int seconds)
841 841
842 When the subprocess exits or the network/serial stream is closed, 842 When the subprocess exits or the network/serial stream is closed,
843 the reader thread sets the status accordingly and exits. It also 843 the reader thread sets the status accordingly and exits. It also
844 exits when the main thread sets the ststus to STATUS_READ_ERROR 844 exits when the main thread sets the status to STATUS_READ_ERROR
845 and/or the char_avail and char_consumed event handles are NULL; 845 and/or the char_avail and char_consumed event handles become NULL;
846 this is how delete_child, called by Emacs when a subprocess or a 846 this is how delete_child, called by Emacs when a subprocess or a
847 stream is terminated, terminates the reader thread as part of 847 stream is terminated, terminates the reader thread as part of
848 deleting the child_process object. 848 deleting the child_process object.
@@ -863,8 +863,8 @@ alarm (int seconds)
863 863
864 If file descriptor zero (stdin) doesn't have its bit set in the 864 If file descriptor zero (stdin) doesn't have its bit set in the
865 'rfds' argument to sys_select, the function always watches for 865 'rfds' argument to sys_select, the function always watches for
866 keyboard interrupts, to be able to return when the user presses 866 keyboard interrupts, to be able to interrupt the wait and return
867 C-g. 867 when the user presses C-g.
868 868
869 Having collected the handles to watch, sys_select calls 869 Having collected the handles to watch, sys_select calls
870 WaitForMultipleObjects to wait for any one of them to become 870 WaitForMultipleObjects to wait for any one of them to become