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

author Po Lu <luangruo@yahoo.com>

Sun, 5 Dec 2021 03:30:14 +0000 (11:30 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 5 Dec 2021 03:30:14 +0000 (11:30 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 5 Dec 2021 03:30:14 +0000 (11:30 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 5 Dec 2021 03:30:14 +0000 (11:30 +0800)
diff --cc doc/lispref/frames.texi
Simple merge
diff --cc lisp/frame.el
Simple merge
diff --cc lisp/mwheel.el
Simple merge
diff --cc lisp/startup.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 5 Dec 2021 03:30:14 +0000 (11:30 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 5 Dec 2021 03:30:14 +0000 (11:30 +0800)
		1	2
doc/lispref/frames.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/frame.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/mwheel.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/startup.el	patch \|	diff1 \|	diff2 \|	blob \| history