Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Tue, 5 Jul 2022 04:30:40 +0000 (06:30 +0200)

committer Stefan Kangas <stefan@marxist.se>

Tue, 5 Jul 2022 04:30:40 +0000 (06:30 +0200)
author Stefan Kangas <stefan@marxist.se>
Tue, 5 Jul 2022 04:30:40 +0000 (06:30 +0200)
committer Stefan Kangas <stefan@marxist.se>
Tue, 5 Jul 2022 04:30:40 +0000 (06:30 +0200)
diff --cc lisp/files.el
Simple merge
diff --cc lisp/simple.el
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Tue, 5 Jul 2022 04:30:40 +0000 (06:30 +0200)
committer	Stefan Kangas <stefan@marxist.se>
	Tue, 5 Jul 2022 04:30:40 +0000 (06:30 +0200)
		1	2
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history