diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2011-12-01 19:27:52 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2011-12-01 19:27:52 +0100 |
| commit | 3360a3fcb0c01428a42f1fb8a0b7459e0e6cac72 (patch) | |
| tree | 1cac0dfd7f6b101a18d744aa08b3ace264cafb92 | |
| parent | ccc6b7b34315f047db9395b9afe65aca2092cace (diff) | |
| download | emacs-3360a3fcb0c01428a42f1fb8a0b7459e0e6cac72.tar.gz | |
Fixes: debbugs:10169
* src/keyboard.c (interrupt_signal): Don't call kill-emacs when
waiting for input.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 <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 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; |