Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Sat, 28 May 2022 05:06:30 +0000 (07:06 +0200)

committer Stefan Kangas <stefan@marxist.se>

Sat, 28 May 2022 05:06:30 +0000 (07:06 +0200)
author Stefan Kangas <stefan@marxist.se>
Sat, 28 May 2022 05:06:30 +0000 (07:06 +0200)
committer Stefan Kangas <stefan@marxist.se>
Sat, 28 May 2022 05:06:30 +0000 (07:06 +0200)
diff --cc doc/emacs/kmacro.texi
Simple merge
diff --cc lisp/color.el
Simple merge
diff --cc lisp/faces.el
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Sat, 28 May 2022 05:06:30 +0000 (07:06 +0200)
committer	Stefan Kangas <stefan@marxist.se>
	Sat, 28 May 2022 05:06:30 +0000 (07:06 +0200)
		1	2
doc/emacs/kmacro.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/color.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	patch \|	diff1 \|	diff2 \|	blob \| history