Merge from origin/emacs-28

author Alan Mackenzie <acm@muc.de>

Sun, 7 Nov 2021 20:53:21 +0000 (20:53 +0000)

committer Alan Mackenzie <acm@muc.de>

Sun, 7 Nov 2021 20:53:21 +0000 (20:53 +0000)
author Alan Mackenzie <acm@muc.de>
Sun, 7 Nov 2021 20:53:21 +0000 (20:53 +0000)
committer Alan Mackenzie <acm@muc.de>
Sun, 7 Nov 2021 20:53:21 +0000 (20:53 +0000)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/files.el
Simple merge
author	Alan Mackenzie <acm@muc.de>
	Sun, 7 Nov 2021 20:53:21 +0000 (20:53 +0000)
committer	Alan Mackenzie <acm@muc.de>
	Sun, 7 Nov 2021 20:53:21 +0000 (20:53 +0000)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history