Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Thu, 8 Sep 2022 08:49:17 +0000 (11:49 +0300)
committerEli Zaretskii <eliz@gnu.org>
Thu, 8 Sep 2022 08:49:17 +0000 (11:49 +0300)

Trivial merge