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

author Po Lu <luangruo@yahoo.com>

Thu, 2 Feb 2023 02:11:32 +0000 (10:11 +0800)

committer Po Lu <luangruo@yahoo.com>

Thu, 2 Feb 2023 02:11:32 +0000 (10:11 +0800)
author Po Lu <luangruo@yahoo.com>
Thu, 2 Feb 2023 02:11:32 +0000 (10:11 +0800)
committer Po Lu <luangruo@yahoo.com>
Thu, 2 Feb 2023 02:11:32 +0000 (10:11 +0800)
diff --cc lisp/isearch.el
Simple merge
diff --cc src/dispnew.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Thu, 2 Feb 2023 02:11:32 +0000 (10:11 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Thu, 2 Feb 2023 02:11:32 +0000 (10:11 +0800)
		1	2
lisp/isearch.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	patch \|	diff1 \|	diff2 \|	blob \| history