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

author Po Lu <luangruo@yahoo.com>

Thu, 6 Jul 2023 00:34:26 +0000 (08:34 +0800)

committer Po Lu <luangruo@yahoo.com>

Thu, 6 Jul 2023 00:34:26 +0000 (08:34 +0800)
author Po Lu <luangruo@yahoo.com>
Thu, 6 Jul 2023 00:34:26 +0000 (08:34 +0800)
committer Po Lu <luangruo@yahoo.com>
Thu, 6 Jul 2023 00:34:26 +0000 (08:34 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
diff --cc lisp/tab-bar.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Thu, 6 Jul 2023 00:34:26 +0000 (08:34 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Thu, 6 Jul 2023 00:34:26 +0000 (08:34 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/tab-bar.el	patch \|	diff1 \|	diff2 \|	blob \| history