Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Tue, 25 Jan 2022 05:31:03 +0000 (06:31 +0100)

committer Stefan Kangas <stefan@marxist.se>

Tue, 25 Jan 2022 05:31:03 +0000 (06:31 +0100)
author Stefan Kangas <stefan@marxist.se>
Tue, 25 Jan 2022 05:31:03 +0000 (06:31 +0100)
committer Stefan Kangas <stefan@marxist.se>
Tue, 25 Jan 2022 05:31:03 +0000 (06:31 +0100)
diff --cc configure.ac
Simple merge
diff --cc lisp/image.el
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Tue, 25 Jan 2022 05:31:03 +0000 (06:31 +0100)
committer	Stefan Kangas <stefan@marxist.se>
	Tue, 25 Jan 2022 05:31:03 +0000 (06:31 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/image.el	patch \|	diff1 \|	diff2 \|	blob \| history