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

author Po Lu <luangruo@yahoo.com>

Fri, 14 Apr 2023 00:02:14 +0000 (08:02 +0800)

committer Po Lu <luangruo@yahoo.com>

Fri, 14 Apr 2023 00:02:14 +0000 (08:02 +0800)
author Po Lu <luangruo@yahoo.com>
Fri, 14 Apr 2023 00:02:14 +0000 (08:02 +0800)
committer Po Lu <luangruo@yahoo.com>
Fri, 14 Apr 2023 00:02:14 +0000 (08:02 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/subr.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Fri, 14 Apr 2023 00:02:14 +0000 (08:02 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Fri, 14 Apr 2023 00:02:14 +0000 (08:02 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history