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

author Po Lu <luangruo@yahoo.com>

Thu, 9 Mar 2023 06:53:37 +0000 (14:53 +0800)

committer Po Lu <luangruo@yahoo.com>

Thu, 9 Mar 2023 06:53:37 +0000 (14:53 +0800)
author Po Lu <luangruo@yahoo.com>
Thu, 9 Mar 2023 06:53:37 +0000 (14:53 +0800)
committer Po Lu <luangruo@yahoo.com>
Thu, 9 Mar 2023 06:53:37 +0000 (14:53 +0800)
diff --cc Makefile.in
Simple merge
diff --cc configure.ac
Simple merge
diff --cc doc/lispref/display.texi
Simple merge
diff --cc lisp/subr.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Thu, 9 Mar 2023 06:53:37 +0000 (14:53 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Thu, 9 Mar 2023 06:53:37 +0000 (14:53 +0800)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/lispref/display.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history