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

author Po Lu <luangruo@yahoo.com>

Thu, 22 Jun 2023 01:02:19 +0000 (09:02 +0800)

committer Po Lu <luangruo@yahoo.com>

Thu, 22 Jun 2023 01:02:19 +0000 (09:02 +0800)
author Po Lu <luangruo@yahoo.com>
Thu, 22 Jun 2023 01:02:19 +0000 (09:02 +0800)
committer Po Lu <luangruo@yahoo.com>
Thu, 22 Jun 2023 01:02:19 +0000 (09:02 +0800)
diff --cc configure.ac
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
diff --cc lisp/progmodes/cc-mode.el
Simple merge
diff --cc lisp/startup.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Thu, 22 Jun 2023 01:02:19 +0000 (09:02 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Thu, 22 Jun 2023 01:02:19 +0000 (09:02 +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/progmodes/cc-mode.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	patch \|	diff1 \|	diff2 \|	blob \| history