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

author Po Lu <luangruo@yahoo.com>

Fri, 17 Dec 2021 06:23:07 +0000 (14:23 +0800)

committer Po Lu <luangruo@yahoo.com>

Fri, 17 Dec 2021 06:23:07 +0000 (14:23 +0800)
author Po Lu <luangruo@yahoo.com>
Fri, 17 Dec 2021 06:23:07 +0000 (14:23 +0800)
committer Po Lu <luangruo@yahoo.com>
Fri, 17 Dec 2021 06:23:07 +0000 (14:23 +0800)
diff --cc src/keyboard.c
Simple merge
diff --cc src/termhooks.h
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Fri, 17 Dec 2021 06:23:07 +0000 (14:23 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Fri, 17 Dec 2021 06:23:07 +0000 (14:23 +0800)
		1	2
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/termhooks.h	patch \|	diff1 \|	diff2 \|	blob \| history