From 3360a3fcb0c01428a42f1fb8a0b7459e0e6cac72 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 1 Dec 2011 19:27:52 +0100 Subject: [PATCH] Fixes: debbugs:10169 * src/keyboard.c (interrupt_signal): Don't call kill-emacs when waiting for input. --- src/ChangeLog | 5 +++++ src/keyboard.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index cd3d5b0ac3c..f230cdba26f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-12-01 Andreas Schwab + + * keyboard.c (interrupt_signal): Don't call kill-emacs when + waiting for input. (Bug#10169) + 2011-11-30 Eli Zaretskii * dispnew.c (adjust_glyph_matrix): Remove the assertion that diff --git a/src/keyboard.c b/src/keyboard.c index e74c7ca1c68..8f316c5e446 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -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; -- 2.39.2