Merge remote-tracking branch 'origin/feature/pgtk' into feature/pgtk

author Po Lu <luangruo@yahoo.com>

Tue, 30 Nov 2021 00:19:46 +0000 (08:19 +0800)

committer Po Lu <luangruo@yahoo.com>

Tue, 30 Nov 2021 00:19:46 +0000 (08:19 +0800)
author Po Lu <luangruo@yahoo.com>
Tue, 30 Nov 2021 00:19:46 +0000 (08:19 +0800)
committer Po Lu <luangruo@yahoo.com>
Tue, 30 Nov 2021 00:19:46 +0000 (08:19 +0800)
diff --cc src/gtkutil.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Tue, 30 Nov 2021 00:19:46 +0000 (08:19 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Tue, 30 Nov 2021 00:19:46 +0000 (08:19 +0800)
		1	2
src/gtkutil.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history