From: Glenn Morris <rgm@gnu.org>
Date: Fri, 16 Nov 2018 16:30:19 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~4153
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=372225ef0268a03fe8edad66817d2ecbc9cfa305;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

b8bbbe5 Avoid kill-emacs-hook errors hanging batch mode
---

372225ef0268a03fe8edad66817d2ecbc9cfa305