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

author Po Lu <luangruo@yahoo.com>

Sat, 24 Jun 2023 01:20:14 +0000 (09:20 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 24 Jun 2023 01:20:14 +0000 (09:20 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 24 Jun 2023 01:20:14 +0000 (09:20 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 24 Jun 2023 01:20:14 +0000 (09:20 +0800)
diff --cc etc/NEWS
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 24 Jun 2023 01:20:14 +0000 (09:20 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 24 Jun 2023 01:20:14 +0000 (09:20 +0800)
		1	2
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history