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

author Po Lu <luangruo@yahoo.com>

Sat, 8 Apr 2023 01:35:59 +0000 (09:35 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 8 Apr 2023 01:35:59 +0000 (09:35 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 8 Apr 2023 01:35:59 +0000 (09:35 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 8 Apr 2023 01:35:59 +0000 (09:35 +0800)
diff --cc lisp/electric.el
Simple merge
diff --cc lisp/gnus/mail-source.el
Simple merge
diff --cc lisp/mwheel.el
Simple merge
diff --cc lisp/speedbar.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 8 Apr 2023 01:35:59 +0000 (09:35 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 8 Apr 2023 01:35:59 +0000 (09:35 +0800)
		1	2
lisp/electric.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/gnus/mail-source.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/mwheel.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/speedbar.el	patch \|	diff1 \|	diff2 \|	blob \| history