; Merge from origin/emacs-26
The following commit was skipped:
fdd1b3e Avoid assertion violation when comparing with main-thread
This commit is contained in:
The following commit was skipped:
fdd1b3e Avoid assertion violation when comparing with main-thread