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

author Po Lu <luangruo@yahoo.com>

Sun, 16 Jul 2023 00:18:13 +0000 (08:18 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 16 Jul 2023 00:18:13 +0000 (08:18 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 16 Jul 2023 00:18:13 +0000 (08:18 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 16 Jul 2023 00:18:13 +0000 (08:18 +0800)
diff --cc configure.ac
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/editfns.c
Simple merge
diff --cc src/lisp.h
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 16 Jul 2023 00:18:13 +0000 (08:18 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 16 Jul 2023 00:18:13 +0000 (08:18 +0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/editfns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history