[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 c854ef7a187: ; Fix last change (bug#60556).
From: |
Eli Zaretskii |
Subject: |
emacs-29 c854ef7a187: ; Fix last change (bug#60556). |
Date: |
Sun, 22 Jan 2023 08:12:35 -0500 (EST) |
branch: emacs-29
commit c854ef7a187a579ab1dc7e022a841b59c4361ebf
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
; Fix last change (bug#60556).
---
src/w32.c | 25 +++++++++++++------------
1 file 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)
/* Shut down cleanly, making sure autosave files are up to date. */
shut_down_emacs (0, Qnil);
}
- {
- /* This handler is run in a thread different from the main
- thread. (This is the normal situation when we are killed
- by Emacs, for example, which sends us the WM_CLOSE
- message). We cannot possibly call functions like
- shut_down_emacs or clear_message_stack in that case, since
- the main (a.k.a. "Lisp") thread could be in the middle of
- some Lisp program. So instead we arrange for maybe_quit to
- kill Emacs. */
- Vquit_flag = Qkill_emacs;
- Vinhibit_quit = Qnil;
- }
+ else
+ {
+ /* This handler is run in a thread different from the main
+ thread. (This is the normal situation when we are killed
+ by Emacs, for example, which sends us the WM_CLOSE
+ message). We cannot possibly call functions like
+ shut_down_emacs or clear_message_stack in that case,
+ since the main (a.k.a. "Lisp") thread could be in the
+ middle of some Lisp program. So instead we arrange for
+ maybe_quit to kill Emacs. */
+ Vquit_flag = Qkill_emacs;
+ Vinhibit_quit = Qnil;
+ }
}
/* Allow other handlers to handle this signal. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 c854ef7a187: ; Fix last change (bug#60556).,
Eli Zaretskii <=