Commit 3360a3fc authored by Andreas Schwab's avatar Andreas Schwab
Browse files

Fixes: debbugs:10169

* src/keyboard.c (interrupt_signal): Don't call kill-emacs when
waiting for input.
parent ccc6b7b3
2011-12-01 Andreas Schwab <schwab@linux-m68k.org>
* keyboard.c (interrupt_signal): Don't call kill-emacs when
waiting for input. (Bug#10169)
2011-11-30 Eli Zaretskii <eliz@gnu.org>
* dispnew.c (adjust_glyph_matrix): Remove the assertion that
......
......@@ -10858,7 +10858,7 @@ interrupt_signal (int signalnum) /* If we don't have an argument, some */
/* If there are no frames there, let's pretend that we are a
well-behaving UN*X program and quit. We cannot do that while
GC is in progress, though. */
if (!gc_in_progress)
if (!gc_in_progress && !waiting_for_input)
Fkill_emacs (Qnil);
else
Vquit_flag = Qt;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment