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

author Po Lu <luangruo@yahoo.com>

Thu, 20 Jul 2023 11:52:01 +0000 (19:52 +0800)

committer Po Lu <luangruo@yahoo.com>

Thu, 20 Jul 2023 11:52:01 +0000 (19:52 +0800)
author Po Lu <luangruo@yahoo.com>
Thu, 20 Jul 2023 11:52:01 +0000 (19:52 +0800)
committer Po Lu <luangruo@yahoo.com>
Thu, 20 Jul 2023 11:52:01 +0000 (19:52 +0800)
diff --cc doc/lispref/keymaps.texi
Simple merge
diff --cc lisp/cus-edit.el
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Thu, 20 Jul 2023 11:52:01 +0000 (19:52 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Thu, 20 Jul 2023 11:52:01 +0000 (19:52 +0800)
		1	2
doc/lispref/keymaps.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/cus-edit.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history