Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Thu, 28 Jul 2022 12:56:24 +0000 (14:56 +0200)

committer Stefan Kangas <stefan@marxist.se>

Thu, 28 Jul 2022 12:56:24 +0000 (14:56 +0200)
author Stefan Kangas <stefan@marxist.se>
Thu, 28 Jul 2022 12:56:24 +0000 (14:56 +0200)
committer Stefan Kangas <stefan@marxist.se>
Thu, 28 Jul 2022 12:56:24 +0000 (14:56 +0200)
diff --cc ChangeLog.3
Simple merge
diff --cc admin/authors.el
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Thu, 28 Jul 2022 12:56:24 +0000 (14:56 +0200)
committer	Stefan Kangas <stefan@marxist.se>
	Thu, 28 Jul 2022 12:56:24 +0000 (14:56 +0200)
		1	2
ChangeLog.3	patch \|	diff1 \|	diff2 \|	blob \| history
admin/authors.el	patch \|	diff1 \|	diff2 \|	blob \| history