Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Sat, 7 May 2022 04:30:32 +0000 (06:30 +0200)

committer Stefan Kangas <stefan@marxist.se>

Sat, 7 May 2022 04:30:32 +0000 (06:30 +0200)
author Stefan Kangas <stefan@marxist.se>
Sat, 7 May 2022 04:30:32 +0000 (06:30 +0200)
committer Stefan Kangas <stefan@marxist.se>
Sat, 7 May 2022 04:30:32 +0000 (06:30 +0200)
diff --cc doc/lispref/display.texi
Simple merge
diff --cc lisp/dired-aux.el
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Sat, 7 May 2022 04:30:32 +0000 (06:30 +0200)
committer	Stefan Kangas <stefan@marxist.se>
	Sat, 7 May 2022 04:30:32 +0000 (06:30 +0200)
		1	2
doc/lispref/display.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/dired-aux.el	patch \|	diff1 \|	diff2 \|	blob \| history