Merge branch 'master' into comment-cachecomment-cache

1 files changed, 5 insertions, 13 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 90c15de2913..84324c48dcf 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -198,11 +198,11 @@ call_process_cleanup (Lisp_Object buffer)
     {
       kill (-synch_process_pid, SIGINT);
       message1 ("Waiting for process to die...(type C-g again to kill it instantly)");
-      immediate_quit = 1;
-      QUIT;
+
+      /* This will quit on C-g.  */
       wait_for_termination (synch_process_pid, 0, 1);
+
       synch_process_pid = 0;
-      immediate_quit = 0;
       message1 ("Waiting for process to die...done");
     }
 #endif  /* !MSDOS */
@@ -726,9 +726,6 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
       process_coding.src_multibyte = 0;
     }
 
-  immediate_quit = 1;
-  QUIT;
-
   if (0 <= fd0)
     {
       enum { CALLPROC_BUFFER_SIZE_MIN = 16 * 1024 };
@@ -749,8 +746,8 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
           nread = carryover;
           while (nread < bufsize - 1024)
             {
-              int this_read = emacs_read (fd0, buf + nread,
-                                          bufsize - nread);
+              int this_read = emacs_read_quit (fd0, buf + nread,
+                                               bufsize - nread);
 
               if (this_read < 0)
                 goto give_up;
@@ -769,7 +766,6 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
             }
 
           /* Now NREAD is the total amount of data in the buffer.  */
-          immediate_quit = 0;
 
           if (!nread)
             ;
@@ -842,8 +838,6 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
                  we should have already detected a coding system.  */
               display_on_the_fly = true;
             }
-          immediate_quit = true;
-          QUIT;
         }
     give_up: ;
 
@@ -860,8 +854,6 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd,
   wait_for_termination (pid, &status, fd0 < 0);
 #endif
 
-  immediate_quit = 0;
-
   /* Don't kill any children that the subprocess may have left behind
      when exiting.  */
   synch_process_pid = 0;