aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2023-01-22 15:12:05 +0200
committerEli Zaretskii2023-01-22 15:12:05 +0200
commitc854ef7a187a579ab1dc7e022a841b59c4361ebf (patch)
tree478f64e7dfab4200ebb02cffd9509d4ffb9d28f4 /src
parent8e83604dfe01e0ea56569c1bc129ecbc67583447 (diff)
downloademacs-c854ef7a187a579ab1dc7e022a841b59c4361ebf.tar.gz
emacs-c854ef7a187a579ab1dc7e022a841b59c4361ebf.zip
; Fix last change (bug#60556).
Diffstat (limited to 'src')
-rw-r--r--src/w32.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/w32.c b/src/w32.c
index 213fee15699..8d344d2e6da 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -10536,18 +10536,19 @@ shutdown_handler (DWORD type)
10536 /* Shut down cleanly, making sure autosave files are up to date. */ 10536 /* Shut down cleanly, making sure autosave files are up to date. */
10537 shut_down_emacs (0, Qnil); 10537 shut_down_emacs (0, Qnil);
10538 } 10538 }
10539 { 10539 else
10540 /* This handler is run in a thread different from the main 10540 {
10541 thread. (This is the normal situation when we are killed 10541 /* This handler is run in a thread different from the main
10542 by Emacs, for example, which sends us the WM_CLOSE 10542 thread. (This is the normal situation when we are killed
10543 message). We cannot possibly call functions like 10543 by Emacs, for example, which sends us the WM_CLOSE
10544 shut_down_emacs or clear_message_stack in that case, since 10544 message). We cannot possibly call functions like
10545 the main (a.k.a. "Lisp") thread could be in the middle of 10545 shut_down_emacs or clear_message_stack in that case,
10546 some Lisp program. So instead we arrange for maybe_quit to 10546 since the main (a.k.a. "Lisp") thread could be in the
10547 kill Emacs. */ 10547 middle of some Lisp program. So instead we arrange for
10548 Vquit_flag = Qkill_emacs; 10548 maybe_quit to kill Emacs. */
10549 Vinhibit_quit = Qnil; 10549 Vquit_flag = Qkill_emacs;
10550 } 10550 Vinhibit_quit = Qnil;
10551 }
10551 } 10552 }
10552 10553
10553 /* Allow other handlers to handle this signal. */ 10554 /* Allow other handlers to handle this signal. */