aboutsummaryrefslogtreecommitdiffstats
path: root/src/callproc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/callproc.c')
-rw-r--r--src/callproc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 85674bb7d9b..710174c46b0 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -198,7 +198,6 @@ call_process_cleanup (Lisp_Object buffer)
198 { 198 {
199 kill (-synch_process_pid, SIGINT); 199 kill (-synch_process_pid, SIGINT);
200 message1 ("Waiting for process to die...(type C-g again to kill it instantly)"); 200 message1 ("Waiting for process to die...(type C-g again to kill it instantly)");
201 maybe_quit ();
202 wait_for_termination (synch_process_pid, 0, 1); 201 wait_for_termination (synch_process_pid, 0, 1);
203 synch_process_pid = 0; 202 synch_process_pid = 0;
204 message1 ("Waiting for process to die...done"); 203 message1 ("Waiting for process to die...done");
@@ -724,8 +723,6 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
724 process_coding.src_multibyte = 0; 723 process_coding.src_multibyte = 0;
725 } 724 }
726 725
727 maybe_quit ();
728
729 if (0 <= fd0) 726 if (0 <= fd0)
730 { 727 {
731 enum { CALLPROC_BUFFER_SIZE_MIN = 16 * 1024 }; 728 enum { CALLPROC_BUFFER_SIZE_MIN = 16 * 1024 };
@@ -746,8 +743,8 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
746 nread = carryover; 743 nread = carryover;
747 while (nread < bufsize - 1024) 744 while (nread < bufsize - 1024)
748 { 745 {
749 int this_read = emacs_read (fd0, buf + nread, 746 int this_read = emacs_read_quit (fd0, buf + nread,
750 bufsize - nread); 747 bufsize - nread);
751 748
752 if (this_read < 0) 749 if (this_read < 0)
753 goto give_up; 750 goto give_up;
@@ -838,8 +835,6 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
838 we should have already detected a coding system. */ 835 we should have already detected a coding system. */
839 display_on_the_fly = true; 836 display_on_the_fly = true;
840 } 837 }
841
842 maybe_quit ();
843 } 838 }
844 give_up: ; 839 give_up: ;
845 840