; Merge from origin/emacs-27

The following commit was skipped:

f5cb5bb828 Revert part of recent commit 85544f8ef5 (bug#40808)
This commit is contained in:
Glenn Morris 2020-05-06 09:22:55 -07:00
commit 29171c3a8c

Diff content is not available