From: Glenn Morris <rgm@gnu.org>
To: 29955-done@debbugs.gnu.org
Subject: bug#29955: 25.2; stale lock files can hang emacs --batch
Date: Tue, 23 Jan 2018 20:59:37 -0500 [thread overview]
Message-ID: <oj7es8m2ye.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <3o607tv4gl.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 22 Jan 2018 18:50:02 -0500")
Version: 27.1
I applied the following to master (though emacs-26 seems appropriate to me).
Together with 28718c4, it should fix this issue.
commit 109da68
Date: Tue Jan 23 20:55:09 2018 -0500
Avoid kill-emacs-hook errors hanging batch mode
* src/emacs.c (Fkill_emacs): Prevent errors from kill-emacs-hook
hanging Emacs in batch mode. (Bug#29955)
diff --git a/src/emacs.c b/src/emacs.c
index 84cd3ac..8ea61b7 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2024,7 +2024,10 @@ all of which are called before Emacs is actually killed. */
/* Fsignal calls emacs_abort () if it sees that waiting_for_input is
set. */
waiting_for_input = 0;
- run_hook (Qkill_emacs_hook);
+ if (noninteractive)
+ safe_run_hooks (Qkill_emacs_hook);
+ else
+ run_hook (Qkill_emacs_hook);
#ifdef HAVE_X_WINDOWS
/* Transfer any clipboards we own to the clipboard manager. */
prev parent reply other threads:[~2018-01-24 1:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 0:56 bug#29955: 25.2; stale lock files can hang emacs --batch David Bremner
2018-01-22 19:58 ` Glenn Morris
2018-01-22 21:15 ` Glenn Morris
2018-01-22 23:50 ` Glenn Morris
2018-01-24 1:59 ` Glenn Morris [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=oj7es8m2ye.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=29955-done@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.