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

author Po Lu <luangruo@yahoo.com>

Sat, 5 Aug 2023 23:38:10 +0000 (07:38 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 5 Aug 2023 23:38:10 +0000 (07:38 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 5 Aug 2023 23:38:10 +0000 (07:38 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 5 Aug 2023 23:38:10 +0000 (07:38 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/bindings.el
Simple merge
diff --cc lisp/dired.el
Simple merge
diff --cc lisp/tab-bar.el
Simple merge
diff --cc src/fileio.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 5 Aug 2023 23:38:10 +0000 (07:38 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 5 Aug 2023 23:38:10 +0000 (07:38 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/bindings.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/dired.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/tab-bar.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history