; Merge from origin/emacs-26

The following commit was skipped:

fdd1b3e Avoid assertion violation when comparing with main-thread
This commit is contained in:
Glenn Morris 2019-06-11 08:38:34 -07:00
commit e545d612df

Diff content is not available