Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Fri, 23 Jun 2023 00:25:30 +0000 (08:25 +0800)

committer Po Lu <luangruo@yahoo.com>

Fri, 23 Jun 2023 00:25:30 +0000 (08:25 +0800)
author Po Lu <luangruo@yahoo.com>
Fri, 23 Jun 2023 00:25:30 +0000 (08:25 +0800)
committer Po Lu <luangruo@yahoo.com>
Fri, 23 Jun 2023 00:25:30 +0000 (08:25 +0800)
diff --cc doc/lispref/display.texi
Simple merge
diff --cc doc/lispref/frames.texi
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Fri, 23 Jun 2023 00:25:30 +0000 (08:25 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Fri, 23 Jun 2023 00:25:30 +0000 (08:25 +0800)
		1	2
doc/lispref/display.texi	patch \|	diff1 \|	diff2 \|	blob \| history
doc/lispref/frames.texi	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp.el	patch \|	diff1 \|	diff2 \|	blob \| history