[Emacs-diffs] /srv/bzr/emacs/trunk r106306: * src/keyboard.c (interrupt_signal): Don't call kill-emacs while in

[Andreas Schwab]

------------------------------------------------------------
revno: 106306
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2011-11-06 20:42:14 +0100
message:
  * src/keyboard.c (interrupt_signal): Don't call kill-emacs while in
  GC.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-06 18:21:52 +0000
+++ b/src/ChangeLog     2011-11-06 19:42:14 +0000
@@ -1,3 +1,8 @@
+2011-11-06  Andreas Schwab  <address@hidden>
+
+       * keyboard.c (interrupt_signal): Don't call kill-emacs while in
+       GC.
+
 2011-11-06  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (init_iterator, reseat_to_string): Don't set the

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2011-10-28 13:48:19 +0000
+++ b/src/keyboard.c    2011-11-06 19:42:14 +0000
@@ -10856,8 +10856,12 @@
   if (!terminal)
     {
       /* If there are no frames there, let's pretend that we are a
-         well-behaving UN*X program and quit.  */
-      Fkill_emacs (Qnil);
+         well-behaving UN*X program and quit.  We cannot do that while
+         GC is in progress, though.  */
+      if (!gc_in_progress)
+       Fkill_emacs (Qnil);
+      else
+       Vquit_flag = Qt;
     }
   else
     {