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

author Po Lu <luangruo@yahoo.com>

Sun, 19 Feb 2023 14:41:42 +0000 (22:41 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 19 Feb 2023 14:41:42 +0000 (22:41 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 19 Feb 2023 14:41:42 +0000 (22:41 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 19 Feb 2023 14:41:42 +0000 (22:41 +0800)
diff --cc lisp/simple.el
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 19 Feb 2023 14:41:42 +0000 (22:41 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 19 Feb 2023 14:41:42 +0000 (22:41 +0800)
		1	2
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history