Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Thu, 10 Feb 2022 05:56:22 +0000 (06:56 +0100)

committer Stefan Kangas <stefan@marxist.se>

Thu, 10 Feb 2022 05:56:22 +0000 (06:56 +0100)
author Stefan Kangas <stefan@marxist.se>
Thu, 10 Feb 2022 05:56:22 +0000 (06:56 +0100)
committer Stefan Kangas <stefan@marxist.se>
Thu, 10 Feb 2022 05:56:22 +0000 (06:56 +0100)
diff --cc lisp/emacs-lisp/comp-cstr.el
Simple merge
diff --cc test/src/comp-tests.el
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Thu, 10 Feb 2022 05:56:22 +0000 (06:56 +0100)
committer	Stefan Kangas <stefan@marxist.se>
	Thu, 10 Feb 2022 05:56:22 +0000 (06:56 +0100)
		1	2
lisp/emacs-lisp/comp-cstr.el	patch \|	diff1 \|	diff2 \|	blob \| history
test/src/comp-tests.el	patch \|	diff1 \|	diff2 \|	blob \| history