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

author Po Lu <luangruo@yahoo.com>

Sat, 4 Mar 2023 12:22:39 +0000 (20:22 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 4 Mar 2023 12:22:39 +0000 (20:22 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 4 Mar 2023 12:22:39 +0000 (20:22 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 4 Mar 2023 12:22:39 +0000 (20:22 +0800)
diff --cc doc/lispref/commands.texi
Simple merge
diff --cc lisp/frame.el
Simple merge
diff --cc src/alloc.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 4 Mar 2023 12:22:39 +0000 (20:22 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 4 Mar 2023 12:22:39 +0000 (20:22 +0800)
		1	2
doc/lispref/commands.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/frame.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history