Merge from origin/emacs-28

author Stefan Kangas <stefankangas@gmail.com>

Thu, 29 Sep 2022 04:30:58 +0000 (06:30 +0200)

committer Stefan Kangas <stefankangas@gmail.com>

Thu, 29 Sep 2022 04:30:58 +0000 (06:30 +0200)
author Stefan Kangas <stefankangas@gmail.com>
Thu, 29 Sep 2022 04:30:58 +0000 (06:30 +0200)
committer Stefan Kangas <stefankangas@gmail.com>
Thu, 29 Sep 2022 04:30:58 +0000 (06:30 +0200)
diff --cc doc/lispref/display.texi
Simple merge
diff --cc lisp/image.el
Simple merge
author	Stefan Kangas <stefankangas@gmail.com>
	Thu, 29 Sep 2022 04:30:58 +0000 (06:30 +0200)
committer	Stefan Kangas <stefankangas@gmail.com>
	Thu, 29 Sep 2022 04:30:58 +0000 (06:30 +0200)
		1	2
doc/lispref/display.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/image.el	patch \|	diff1 \|	diff2 \|	blob \| history