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

author Po Lu <luangruo@yahoo.com>

Sat, 22 Apr 2023 01:21:25 +0000 (09:21 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 22 Apr 2023 01:21:25 +0000 (09:21 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 22 Apr 2023 01:21:25 +0000 (09:21 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 22 Apr 2023 01:21:25 +0000 (09:21 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc src/fringe.c
Simple merge
diff --cc src/term.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 22 Apr 2023 01:21:25 +0000 (09:21 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 22 Apr 2023 01:21:25 +0000 (09:21 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
src/fringe.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/term.c	patch \|	diff1 \|	diff2 \|	blob \| history