Merge from origin/emacs-28

author Stefan Kangas <stefankangas@gmail.com>

Sun, 19 Feb 2023 16:35:20 +0000 (17:35 +0100)

committer Stefan Kangas <stefankangas@gmail.com>

Sun, 19 Feb 2023 16:35:20 +0000 (17:35 +0100)
author Stefan Kangas <stefankangas@gmail.com>
Sun, 19 Feb 2023 16:35:20 +0000 (17:35 +0100)
committer Stefan Kangas <stefankangas@gmail.com>
Sun, 19 Feb 2023 16:35:20 +0000 (17:35 +0100)
diff --cc ChangeLog.3
Simple merge
diff --cc etc/AUTHORS
Simple merge
author	Stefan Kangas <stefankangas@gmail.com>
	Sun, 19 Feb 2023 16:35:20 +0000 (17:35 +0100)
committer	Stefan Kangas <stefankangas@gmail.com>
	Sun, 19 Feb 2023 16:35:20 +0000 (17:35 +0100)
		1	2
ChangeLog.3	patch \|	diff1 \|	diff2 \|	blob \| history
etc/AUTHORS	patch \|	diff1 \|	diff2 \|	blob \| history