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

author Po Lu <luangruo@yahoo.com>

Wed, 8 Feb 2023 14:41:46 +0000 (22:41 +0800)

committer Po Lu <luangruo@yahoo.com>

Wed, 8 Feb 2023 14:41:46 +0000 (22:41 +0800)
author Po Lu <luangruo@yahoo.com>
Wed, 8 Feb 2023 14:41:46 +0000 (22:41 +0800)
committer Po Lu <luangruo@yahoo.com>
Wed, 8 Feb 2023 14:41:46 +0000 (22:41 +0800)
diff --cc doc/lispref/display.texi
Simple merge
diff --cc lisp/isearch.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Wed, 8 Feb 2023 14:41:46 +0000 (22:41 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Wed, 8 Feb 2023 14:41:46 +0000 (22:41 +0800)
		1	2
doc/lispref/display.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/isearch.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history