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

author Po Lu <luangruo@yahoo.com>

Sun, 4 Jun 2023 00:33:30 +0000 (08:33 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 4 Jun 2023 00:33:30 +0000 (08:33 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 4 Jun 2023 00:33:30 +0000 (08:33 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 4 Jun 2023 00:33:30 +0000 (08:33 +0800)
diff --cc lisp/minibuffer.el
Simple merge
diff --cc lisp/net/browse-url.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc src/lread.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 4 Jun 2023 00:33:30 +0000 (08:33 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 4 Jun 2023 00:33:30 +0000 (08:33 +0800)
		1	2
lisp/minibuffer.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/browse-url.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/lread.c	patch \|	diff1 \|	diff2 \|	blob \| history