Merge from origin/emacs-28

author Stefan Kangas <stefankangas@gmail.com>

Sun, 9 Oct 2022 04:31:06 +0000 (06:31 +0200)

committer Stefan Kangas <stefankangas@gmail.com>

Sun, 9 Oct 2022 04:31:06 +0000 (06:31 +0200)
author Stefan Kangas <stefankangas@gmail.com>
Sun, 9 Oct 2022 04:31:06 +0000 (06:31 +0200)
committer Stefan Kangas <stefankangas@gmail.com>
Sun, 9 Oct 2022 04:31:06 +0000 (06:31 +0200)
diff --cc doc/lispref/files.texi
Simple merge
diff --cc lisp/files.el
Simple merge
author	Stefan Kangas <stefankangas@gmail.com>
	Sun, 9 Oct 2022 04:31:06 +0000 (06:31 +0200)
committer	Stefan Kangas <stefankangas@gmail.com>
	Sun, 9 Oct 2022 04:31:06 +0000 (06:31 +0200)
		1	2
doc/lispref/files.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history