Merge from origin/emacs-28

author Ken Brown <kbrown@cornell.edu>

Sun, 31 Oct 2021 23:36:04 +0000 (19:36 -0400)

committer Ken Brown <kbrown@cornell.edu>

Sun, 31 Oct 2021 23:36:04 +0000 (19:36 -0400)
author Ken Brown <kbrown@cornell.edu>
Sun, 31 Oct 2021 23:36:04 +0000 (19:36 -0400)
committer Ken Brown <kbrown@cornell.edu>
Sun, 31 Oct 2021 23:36:04 +0000 (19:36 -0400)
diff --cc configure.ac
Simple merge
diff --cc doc/emacs/help.texi
Simple merge
author	Ken Brown <kbrown@cornell.edu>
	Sun, 31 Oct 2021 23:36:04 +0000 (19:36 -0400)
committer	Ken Brown <kbrown@cornell.edu>
	Sun, 31 Oct 2021 23:36:04 +0000 (19:36 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/emacs/help.texi	patch \|	diff1 \|	diff2 \|	blob \| history