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

author Po Lu <luangruo@yahoo.com>

Sun, 23 Apr 2023 00:36:11 +0000 (08:36 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 23 Apr 2023 00:36:11 +0000 (08:36 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 23 Apr 2023 00:36:11 +0000 (08:36 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 23 Apr 2023 00:36:11 +0000 (08:36 +0800)
diff --cc .dir-locals.el
Simple merge
diff --cc etc/NEWS
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 23 Apr 2023 00:36:11 +0000 (08:36 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 23 Apr 2023 00:36:11 +0000 (08:36 +0800)
		1	2
.dir-locals.el	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history