From: Glenn Morris <rgm@gnu.org>
Date: Tue, 11 Jun 2019 15:38:34 +0000 (-0700)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~2619
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e545d612df8111d2dc76c115685ccd3f426ee2ee;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

fdd1b3e Avoid assertion violation when comparing with main-thread
---

e545d612df8111d2dc76c115685ccd3f426ee2ee