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

author Po Lu <luangruo@yahoo.com>

Sat, 28 Jan 2023 06:30:27 +0000 (14:30 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 28 Jan 2023 06:30:27 +0000 (14:30 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 28 Jan 2023 06:30:27 +0000 (14:30 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 28 Jan 2023 06:30:27 +0000 (14:30 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc src/xfaces.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 28 Jan 2023 06:30:27 +0000 (14:30 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 28 Jan 2023 06:30:27 +0000 (14:30 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/xfaces.c	patch \|	diff1 \|	diff2 \|	blob \| history