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

author Po Lu <luangruo@yahoo.com>

Sat, 29 Apr 2023 00:28:01 +0000 (08:28 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 29 Apr 2023 00:28:01 +0000 (08:28 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 29 Apr 2023 00:28:01 +0000 (08:28 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 29 Apr 2023 00:28:01 +0000 (08:28 +0800)
diff --cc lisp/faces.el
Simple merge
diff --cc lisp/ls-lisp.el
Simple merge
diff --cc lisp/progmodes/cperl-mode.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 29 Apr 2023 00:28:01 +0000 (08:28 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 29 Apr 2023 00:28:01 +0000 (08:28 +0800)
		1	2
lisp/faces.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/ls-lisp.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/cperl-mode.el	patch \|	diff1 \|	diff2 \|	blob \| history