diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-02-01 15:18:43 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-02-01 15:23:19 -0800 |
| commit | 33be50037c2b4cdb002538534e9915c6bad253b7 (patch) | |
| tree | 04a387a7afb86c86c4eaea71175d6d9fd1c37047 /src/callproc.c | |
| parent | 94ad13b93c6fc099a353c8eb27c00a68ee79a952 (diff) | |
| download | emacs-33be50037c2b4cdb002538534e9915c6bad253b7.tar.gz | |
Remove immediate_quit.
The old code that sets and clears immediate_quit was
ineffective except when Emacs is running in terminal mode, and
has problematic race conditions anyway, so remove it. This
will introduce some hangs when Emacs runs in terminal mode,
and these hangs should be fixed in followup patches.
* src/keyboard.c (immediate_quit): Remove. All uses removed.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/callproc.c b/src/callproc.c index 301ccf383b5..85674bb7d9b 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -198,11 +198,9 @@ 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 = true; maybe_quit (); wait_for_termination (synch_process_pid, 0, 1); synch_process_pid = 0; - immediate_quit = false; message1 ("Waiting for process to die...done"); } #endif /* !MSDOS */ @@ -726,7 +724,6 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, process_coding.src_multibyte = 0; } - immediate_quit = true; maybe_quit (); if (0 <= fd0) @@ -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 = false; if (!nread) ; @@ -842,7 +838,7 @@ 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; + maybe_quit (); } give_up: ; @@ -860,8 +856,6 @@ call_process (ptrdiff_t nargs, Lisp_Object *args, int filefd, wait_for_termination (pid, &status, fd0 < 0); #endif - immediate_quit = false; - /* Don't kill any children that the subprocess may have left behind when exiting. */ synch_process_pid = 0; |