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

author Po Lu <luangruo@yahoo.com>

Thu, 11 May 2023 00:58:57 +0000 (08:58 +0800)

committer Po Lu <luangruo@yahoo.com>

Thu, 11 May 2023 00:58:57 +0000 (08:58 +0800)
author Po Lu <luangruo@yahoo.com>
Thu, 11 May 2023 00:58:57 +0000 (08:58 +0800)
committer Po Lu <luangruo@yahoo.com>
Thu, 11 May 2023 00:58:57 +0000 (08:58 +0800)
diff --cc lisp/simple.el
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/fontset.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Thu, 11 May 2023 00:58:57 +0000 (08:58 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Thu, 11 May 2023 00:58:57 +0000 (08:58 +0800)
		1	2
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/fontset.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history