Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Sat, 9 Jul 2022 04:30:38 +0000 (06:30 +0200)

committer Stefan Kangas <stefan@marxist.se>

Sat, 9 Jul 2022 04:30:38 +0000 (06:30 +0200)
author Stefan Kangas <stefan@marxist.se>
Sat, 9 Jul 2022 04:30:38 +0000 (06:30 +0200)
committer Stefan Kangas <stefan@marxist.se>
Sat, 9 Jul 2022 04:30:38 +0000 (06:30 +0200)
diff --cc lisp/textmodes/rst.el
Simple merge
diff --cc src/window.c
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Sat, 9 Jul 2022 04:30:38 +0000 (06:30 +0200)
committer	Stefan Kangas <stefan@marxist.se>
	Sat, 9 Jul 2022 04:30:38 +0000 (06:30 +0200)
		1	2
lisp/textmodes/rst.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history