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

author Po Lu <luangruo@yahoo.com>

Sat, 13 May 2023 00:53:57 +0000 (08:53 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 13 May 2023 00:53:57 +0000 (08:53 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 13 May 2023 00:53:57 +0000 (08:53 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 13 May 2023 00:53:57 +0000 (08:53 +0800)
diff --cc lisp/files.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/fns.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 13 May 2023 00:53:57 +0000 (08:53 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 13 May 2023 00:53:57 +0000 (08:53 +0800)
		1	2
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/fns.c	patch \|	diff1 \|	diff2 \|	blob \| history