[Emacs-diffs] /srv/bzr/emacs/trunk r106568: Fixes: debbugs:10169

[Andreas Schwab]

------------------------------------------------------------
revno: 106568
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2011-12-01 19:27:52 +0100
message:
  Fixes: debbugs:10169
  
  * src/keyboard.c (interrupt_signal): Don't call kill-emacs when
  waiting for input.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-30 16:50:38 +0000
+++ b/src/ChangeLog     2011-12-01 18:27:52 +0000
@@ -1,3 +1,8 @@
+2011-12-01  Andreas Schwab  <address@hidden>
+
+       * keyboard.c (interrupt_signal): Don't call kill-emacs when
+       waiting for input.  (Bug#10169)
+
 2011-11-30  Eli Zaretskii  <address@hidden>
 
        * dispnew.c (adjust_glyph_matrix): Remove the assertion that

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2011-11-28 08:20:58 +0000
+++ b/src/keyboard.c    2011-12-01 18:27:52 +0000
@@ -10858,7 +10858,7 @@
       /* 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;