aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorPaul Eggert2017-02-01 15:18:43 -0800
committerPaul Eggert2017-02-01 15:23:19 -0800
commit33be50037c2b4cdb002538534e9915c6bad253b7 (patch)
tree04a387a7afb86c86c4eaea71175d6d9fd1c37047 /src/eval.c
parent94ad13b93c6fc099a353c8eb27c00a68ee79a952 (diff)
downloademacs-33be50037c2b4cdb002538534e9915c6bad253b7.tar.gz
emacs-33be50037c2b4cdb002538534e9915c6bad253b7.zip
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/eval.c')
-rw-r--r--src/eval.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index 62d4af15e27..844879d6a2d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1131,7 +1131,6 @@ unwind_to_catch (struct handler *catch, Lisp_Object value)
1131 /* Restore certain special C variables. */ 1131 /* Restore certain special C variables. */
1132 set_poll_suppress_count (catch->poll_suppress_count); 1132 set_poll_suppress_count (catch->poll_suppress_count);
1133 unblock_input_to (catch->interrupt_input_blocked); 1133 unblock_input_to (catch->interrupt_input_blocked);
1134 immediate_quit = false;
1135 1134
1136 do 1135 do
1137 { 1136 {
@@ -1517,7 +1516,6 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool keyboard_quit)
1517 Lisp_Object clause = Qnil; 1516 Lisp_Object clause = Qnil;
1518 struct handler *h; 1517 struct handler *h;
1519 1518
1520 immediate_quit = false;
1521 if (gc_in_progress || waiting_for_input) 1519 if (gc_in_progress || waiting_for_input)
1522 emacs_abort (); 1520 emacs_abort ();
1523 1521