mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-22 18:35:09 +00:00
* src/keyboard.c (interrupt_signal): Don't call kill-emacs while in
GC.
This commit is contained in:
parent
88a37c4d87
commit
b70413668a
@ -1,3 +1,8 @@
|
||||
2011-11-06 Andreas Schwab <schwab@linux-m68k.org>
|
||||
|
||||
* keyboard.c (interrupt_signal): Don't call kill-emacs while in
|
||||
GC.
|
||||
|
||||
2011-11-06 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* xdisp.c (init_iterator, reseat_to_string): Don't set the
|
||||
|
@ -10856,8 +10856,12 @@ interrupt_signal (int signalnum) /* If we don't have an argument, some */
|
||||
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
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user