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

author Po Lu <luangruo@yahoo.com>

Wed, 26 Apr 2023 00:48:12 +0000 (08:48 +0800)

committer Po Lu <luangruo@yahoo.com>

Wed, 26 Apr 2023 00:48:12 +0000 (08:48 +0800)
author Po Lu <luangruo@yahoo.com>
Wed, 26 Apr 2023 00:48:12 +0000 (08:48 +0800)
committer Po Lu <luangruo@yahoo.com>
Wed, 26 Apr 2023 00:48:12 +0000 (08:48 +0800)
diff --cc configure.ac
Simple merge
diff --cc doc/lispref/commands.texi
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/international/fontset.el
Simple merge
diff --cc lisp/net/eww.el
Simple merge
diff --cc src/fns.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Wed, 26 Apr 2023 00:48:12 +0000 (08:48 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Wed, 26 Apr 2023 00:48:12 +0000 (08:48 +0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/lispref/commands.texi	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/international/fontset.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/eww.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/fns.c	patch \|	diff1 \|	diff2 \|	blob \| history