Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs into emacs-28
authorEli Zaretskii <eliz@gnu.org>
Mon, 29 Nov 2021 20:30:37 +0000 (22:30 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 29 Nov 2021 20:30:37 +0000 (22:30 +0200)

Trivial merge