Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/emacs into emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 14 Jan 2023 16:30:05 +0000 (18:30 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 14 Jan 2023 16:30:05 +0000 (18:30 +0200)

Trivial merge