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

author Po Lu <luangruo@yahoo.com>

Sat, 4 Feb 2023 11:50:00 +0000 (19:50 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 4 Feb 2023 11:50:00 +0000 (19:50 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 4 Feb 2023 11:50:00 +0000 (19:50 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 4 Feb 2023 11:50:00 +0000 (19:50 +0800)
diff --cc lisp/faces.el
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/xfaces.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 4 Feb 2023 11:50:00 +0000 (19:50 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 4 Feb 2023 11:50:00 +0000 (19:50 +0800)
		1	2
lisp/faces.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/xfaces.c	patch \|	diff1 \|	diff2 \|	blob \| history