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

author Po Lu <luangruo@yahoo.com>

Thu, 25 May 2023 00:20:56 +0000 (08:20 +0800)

committer Po Lu <luangruo@yahoo.com>

Thu, 25 May 2023 00:20:56 +0000 (08:20 +0800)
author Po Lu <luangruo@yahoo.com>
Thu, 25 May 2023 00:20:56 +0000 (08:20 +0800)
committer Po Lu <luangruo@yahoo.com>
Thu, 25 May 2023 00:20:56 +0000 (08:20 +0800)
diff --cc lisp/loadup.el
Simple merge
diff --cc lisp/startup.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Thu, 25 May 2023 00:20:56 +0000 (08:20 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Thu, 25 May 2023 00:20:56 +0000 (08:20 +0800)
		1	2
lisp/loadup.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	patch \|	diff1 \|	diff2 \|	blob \| history