Merge from origin/emacs-28

author Stefan Kangas <stefan@marxist.se>

Sun, 27 Feb 2022 05:31:54 +0000 (06:31 +0100)

committer Stefan Kangas <stefan@marxist.se>

Sun, 27 Feb 2022 05:31:54 +0000 (06:31 +0100)
author Stefan Kangas <stefan@marxist.se>
Sun, 27 Feb 2022 05:31:54 +0000 (06:31 +0100)
committer Stefan Kangas <stefan@marxist.se>
Sun, 27 Feb 2022 05:31:54 +0000 (06:31 +0100)
diff --cc doc/lispref/display.texi
Simple merge
diff --cc lisp/faces.el
Simple merge
diff --cc lisp/net/tramp-sh.el
Simple merge
author	Stefan Kangas <stefan@marxist.se>
	Sun, 27 Feb 2022 05:31:54 +0000 (06:31 +0100)
committer	Stefan Kangas <stefan@marxist.se>
	Sun, 27 Feb 2022 05:31:54 +0000 (06:31 +0100)
		1	2
doc/lispref/display.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp-sh.el	patch \|	diff1 \|	diff2 \|	blob \| history