Merge from origin/emacs-29

author Stefan Kangas <stefankangas@gmail.com>

Thu, 27 Apr 2023 04:30:14 +0000 (06:30 +0200)

committer Stefan Kangas <stefankangas@gmail.com>

Thu, 27 Apr 2023 04:30:14 +0000 (06:30 +0200)
author Stefan Kangas <stefankangas@gmail.com>
Thu, 27 Apr 2023 04:30:14 +0000 (06:30 +0200)
committer Stefan Kangas <stefankangas@gmail.com>
Thu, 27 Apr 2023 04:30:14 +0000 (06:30 +0200)
diff --cc doc/misc/erc.texi
Simple merge
diff --cc etc/PROBLEMS
Simple merge
author	Stefan Kangas <stefankangas@gmail.com>
	Thu, 27 Apr 2023 04:30:14 +0000 (06:30 +0200)
committer	Stefan Kangas <stefankangas@gmail.com>
	Thu, 27 Apr 2023 04:30:14 +0000 (06:30 +0200)
		1	2
doc/misc/erc.texi	patch \|	diff1 \|	diff2 \|	blob \| history
etc/PROBLEMS	patch \|	diff1 \|	diff2 \|	blob \| history