From: Glenn Morris <rgm@gnu.org>
Date: Wed, 6 May 2020 16:22:55 +0000 (-0700)
Subject: ; Merge from origin/emacs-27
X-Git-Tag: emacs-28.0.90~7430
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=29171c3a8c4dcd1f740df84c759397b6ffef68ee;p=emacs.git

; Merge from origin/emacs-27

The following commit was skipped:

f5cb5bb828 Revert part of recent commit 85544f8ef5 (bug#40808)
---

29171c3a8c4dcd1f740df84c759397b6ffef68ee