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

author Po Lu <luangruo@yahoo.com>

Thu, 20 Jul 2023 01:23:06 +0000 (09:23 +0800)

committer Po Lu <luangruo@yahoo.com>

Thu, 20 Jul 2023 01:23:06 +0000 (09:23 +0800)
author Po Lu <luangruo@yahoo.com>
Thu, 20 Jul 2023 01:23:06 +0000 (09:23 +0800)
committer Po Lu <luangruo@yahoo.com>
Thu, 20 Jul 2023 01:23:06 +0000 (09:23 +0800)
diff --cc src/fileio.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Thu, 20 Jul 2023 01:23:06 +0000 (09:23 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Thu, 20 Jul 2023 01:23:06 +0000 (09:23 +0800)
		1	2
src/fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history