Merge from origin/emacs-28

author Stefan Kangas <stefankangas@gmail.com>

Fri, 2 Sep 2022 21:57:18 +0000 (23:57 +0200)

committer Stefan Kangas <stefankangas@gmail.com>

Fri, 2 Sep 2022 21:57:18 +0000 (23:57 +0200)
author Stefan Kangas <stefankangas@gmail.com>
Fri, 2 Sep 2022 21:57:18 +0000 (23:57 +0200)
committer Stefan Kangas <stefankangas@gmail.com>
Fri, 2 Sep 2022 21:57:18 +0000 (23:57 +0200)
diff --cc doc/emacs/maintaining.texi
Simple merge
diff --cc lisp/faces.el
Simple merge
author	Stefan Kangas <stefankangas@gmail.com>
	Fri, 2 Sep 2022 21:57:18 +0000 (23:57 +0200)
committer	Stefan Kangas <stefankangas@gmail.com>
	Fri, 2 Sep 2022 21:57:18 +0000 (23:57 +0200)
		1	2
doc/emacs/maintaining.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	patch \|	diff1 \|	diff2 \|	blob \| history