Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Tue, 26 Jul 2022 04:30:19 +0000 (06:30 +0200)

committer Stefan Kangas <stefan@marxist.se>

Tue, 26 Jul 2022 04:30:19 +0000 (06:30 +0200)
author Stefan Kangas <stefan@marxist.se>
Tue, 26 Jul 2022 04:30:19 +0000 (06:30 +0200)
committer Stefan Kangas <stefan@marxist.se>
Tue, 26 Jul 2022 04:30:19 +0000 (06:30 +0200)
diff --cc doc/emacs/search.texi
Simple merge
diff --cc src/window.c
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Tue, 26 Jul 2022 04:30:19 +0000 (06:30 +0200)
committer	Stefan Kangas <stefan@marxist.se>
	Tue, 26 Jul 2022 04:30:19 +0000 (06:30 +0200)
		1	2
doc/emacs/search.texi	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history